summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2003-12-07 01:28:50 -0500
committerTheodore Ts'o <tytso@mit.edu>2003-12-07 01:28:50 -0500
commit544349270e4c74a6feb971123884a8cf5052a7ee (patch)
tree7c3c483148953f1cd5eadc9cf5eb6f7faabc31c5 /util
parent3de085dd4109e6a7049dd6b85abf0313167cab5b (diff)
downloade2fsprogs-544349270e4c74a6feb971123884a8cf5052a7ee.tar.gz
Fix gcc -Wall nitpicks
Diffstat (limited to 'util')
-rw-r--r--util/ChangeLog7
-rw-r--r--util/gcc-wall-cleanup5
-rw-r--r--util/subst.c4
3 files changed, 14 insertions, 2 deletions
diff --git a/util/ChangeLog b/util/ChangeLog
index 2a21183d..1501bda9 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-07 Theodore Ts'o <tytso@mit.edu>
+
+ * subst.c: Fix gcc -Wall nitpicks.
+
+ * gcc-wall-cleanup: Remove missing initalizer, zero-length format
+ string, and some more long long warnings.
+
2003-07-25 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.34
diff --git a/util/gcc-wall-cleanup b/util/gcc-wall-cleanup
index 4d817b1e..6148e461 100644
--- a/util/gcc-wall-cleanup
+++ b/util/gcc-wall-cleanup
@@ -6,12 +6,17 @@
/^kcc /d
/^gcc /d
/does not support `long long'/d
+/forbids long long integer constants/d
/does not support the `ll' length modifier/d
+/does not support the `ll' printf length modifier/d
/ANSI C forbids long long integer constants/d
/traditional C rejects string concatenation/d
/integer constant is unsigned in ANSI C, signed with -traditional/d
/At top level:/d
/In file included from/d
/In function `.*':/d
+/zero-length format string/d
+/warning: missing initializer/d
+/warning: (near initialization for/d
/^[ ]*from/d
diff --git a/util/subst.c b/util/subst.c
index 7b7ba838..dff1848b 100644
--- a/util/subst.c
+++ b/util/subst.c
@@ -74,7 +74,7 @@ static struct subst_entry *fetch_subst_entry(char *name)
* Given the starting and ending position of the replacement name,
* check to see if it is valid, and pull it out if it is.
*/
-static char *get_subst_symbol(const char *begin, int len, char prefix)
+static char *get_subst_symbol(const char *begin, size_t len, char prefix)
{
static char replace_name[128];
char *cp, *start;
@@ -121,7 +121,7 @@ static void substitute_line(char *line)
char *ptr, *name_ptr, *end_ptr;
struct subst_entry *ent;
char *replace_name;
- int len;
+ size_t len;
/*
* Expand all @FOO@ substitutions