From: Ted Lemon <source@isc.org>
Date: Mon, 24 Jun 1996 20:29:29 +0000 (+0000)
Subject: Change printf formats to not assume longs and ints are the same size
X-Git-Tag: BETA_4_6~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8b8bc8e37fe21d77ae899df7fa52000c0f577e9;p=thirdparty%2Fdhcp.git

Change printf formats to not assume longs and ints are the same size
---

diff --git a/confpars.c b/confpars.c
index 2fe5b984c..0d1da36fe 100644
--- a/confpars.c
+++ b/confpars.c
@@ -1530,15 +1530,15 @@ void convert_num (buf, str, base, size)
 	if (val > max) {
 		switch (base) {
 		      case 8:
-			warn ("value %s%lo exceeds max (%d) for precision.",
+			warn ("value %s%o exceeds max (%d) for precision.",
 			      negative ? "-" : "", val, max);
 			break;
 		      case 16:
-			warn ("value %s%lx exceeds max (%d) for precision.",
+			warn ("value %s%x exceeds max (%d) for precision.",
 			      negative ? "-" : "", val, max);
 			break;
 		      default:
-			warn ("value %s%ld exceeds max (%d) for precision.",
+			warn ("value %s%u exceeds max (%d) for precision.",
 			      negative ? "-" : "", val, max);
 			break;
 		}
@@ -1556,7 +1556,7 @@ void convert_num (buf, str, base, size)
 			putLong (buf, -(unsigned long)val);
 			break;
 		      default:
-			warn ("Unexpected integer size: %d\n");
+			warn ("Unexpected integer size: %d\n", size);
 			break;
 		}
 	} else {
@@ -1571,7 +1571,7 @@ void convert_num (buf, str, base, size)
 			putULong (buf, val);
 			break;
 		      default:
-			warn ("Unexpected integer size: %d\n");
+			warn ("Unexpected integer size: %d\n", size);
 			break;
 		}
 	}
diff --git a/server/confpars.c b/server/confpars.c
index 2fe5b984c..0d1da36fe 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -1530,15 +1530,15 @@ void convert_num (buf, str, base, size)
 	if (val > max) {
 		switch (base) {
 		      case 8:
-			warn ("value %s%lo exceeds max (%d) for precision.",
+			warn ("value %s%o exceeds max (%d) for precision.",
 			      negative ? "-" : "", val, max);
 			break;
 		      case 16:
-			warn ("value %s%lx exceeds max (%d) for precision.",
+			warn ("value %s%x exceeds max (%d) for precision.",
 			      negative ? "-" : "", val, max);
 			break;
 		      default:
-			warn ("value %s%ld exceeds max (%d) for precision.",
+			warn ("value %s%u exceeds max (%d) for precision.",
 			      negative ? "-" : "", val, max);
 			break;
 		}
@@ -1556,7 +1556,7 @@ void convert_num (buf, str, base, size)
 			putLong (buf, -(unsigned long)val);
 			break;
 		      default:
-			warn ("Unexpected integer size: %d\n");
+			warn ("Unexpected integer size: %d\n", size);
 			break;
 		}
 	} else {
@@ -1571,7 +1571,7 @@ void convert_num (buf, str, base, size)
 			putULong (buf, val);
 			break;
 		      default:
-			warn ("Unexpected integer size: %d\n");
+			warn ("Unexpected integer size: %d\n", size);
 			break;
 		}
 	}