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

diff --git a/confpars.c b/confpars.c
index 2fe5b984ce1f81f83820b3191ca327a0fcd0b2b8..0d1da36fee7a028743dc0be294e6ca5c65f977de 100644 (file)
--- 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 2fe5b984ce1f81f83820b3191ca327a0fcd0b2b8..0d1da36fee7a028743dc0be294e6ca5c65f977de 100644 (file)
--- 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;
                }
        }