Silence some clang warnings

[openldap] / libraries / liblmdb / mdb_load.c

diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
index ec9f9ad341b9d9bb55a897e07bbfd2bf4852d913..e0d95e13c3f6f006888e19b55d4f35a4d0c7eb80 100644 (file)
--- a/libraries/liblmdb/mdb_load.c
+++ b/libraries/liblmdb/mdb_load.c
@@ -32,12 +32,18 @@ static int flags;
 
 static char *prog;
 
-static int eof;
+static int Eof;
 
 static MDB_envinfo info;
 
 static MDB_val kbuf, dbuf;
 
+#ifdef _WIN32
+#define Z      "I"
+#else
+#define Z      "z"
+#endif
+
 #define STRLENOF(s)    (sizeof(s)-1)
 
 typedef struct flagbit {
@@ -58,9 +64,7 @@ flagbit dbflags[] = {
        { 0, NULL, 0 }
 };
 
-static const char hexc[] = "0123456789abcdef";
-
-static void readhdr()
+static void readhdr(void)
 {
        char *ptr;
 
@@ -69,7 +73,7 @@ static void readhdr()
                if (!strncmp(dbuf.mv_data, "VERSION=", STRLENOF("VERSION="))) {
                        version=atoi((char *)dbuf.mv_data+STRLENOF("VERSION="));
                        if (version > 3) {
-                               fprintf(stderr, "%s: line %zd: unsupported VERSION %d\n",
+                               fprintf(stderr, "%s: line %" Z "d: unsupported VERSION %d\n",
                                        prog, lineno, version);
                                exit(EXIT_FAILURE);
                        }
@@ -79,7 +83,7 @@ static void readhdr()
                        if (!strncmp((char *)dbuf.mv_data+STRLENOF("FORMAT="), "print", STRLENOF("print")))
                                mode |= PRINT;
                        else if (strncmp((char *)dbuf.mv_data+STRLENOF("FORMAT="), "bytevalue", STRLENOF("bytevalue"))) {
-                               fprintf(stderr, "%s: line %zd: unsupported FORMAT %s\n",
+                               fprintf(stderr, "%s: line %" Z "d: unsupported FORMAT %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("FORMAT="));
                                exit(EXIT_FAILURE);
                        }
@@ -90,7 +94,7 @@ static void readhdr()
                        subname = strdup((char *)dbuf.mv_data+STRLENOF("database="));
                } else if (!strncmp(dbuf.mv_data, "type=", STRLENOF("type="))) {
                        if (strncmp((char *)dbuf.mv_data+STRLENOF("type="), "btree", STRLENOF("btree")))  {
-                               fprintf(stderr, "%s: line %zd: unsupported type %s\n",
+                               fprintf(stderr, "%s: line %" Z "d: unsupported type %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("type="));
                                exit(EXIT_FAILURE);
                        }
@@ -100,7 +104,7 @@ static void readhdr()
                        if (ptr) *ptr = '\0';
                        i = sscanf((char *)dbuf.mv_data+STRLENOF("mapaddr="), "%p", &info.me_mapaddr);
                        if (i != 1) {
-                               fprintf(stderr, "%s: line %zd: invalid mapaddr %s\n",
+                               fprintf(stderr, "%s: line %" Z "d: invalid mapaddr %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("mapaddr="));
                                exit(EXIT_FAILURE);
                        }
@@ -108,9 +112,9 @@ static void readhdr()
                        int i;
                        ptr = memchr(dbuf.mv_data, '\n', dbuf.mv_size);
                        if (ptr) *ptr = '\0';
-                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%zu", &info.me_mapsize);
+                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%" Z "u", &info.me_mapsize);
                        if (i != 1) {
-                               fprintf(stderr, "%s: line %zd: invalid mapsize %s\n",
+                               fprintf(stderr, "%s: line %" Z "d: invalid mapsize %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("mapsize="));
                                exit(EXIT_FAILURE);
                        }
@@ -120,7 +124,7 @@ static void readhdr()
                        if (ptr) *ptr = '\0';
                        i = sscanf((char *)dbuf.mv_data+STRLENOF("maxreaders="), "%u", &info.me_maxreaders);
                        if (i != 1) {
-                               fprintf(stderr, "%s: line %zd: invalid maxreaders %s\n",
+                               fprintf(stderr, "%s: line %" Z "d: invalid maxreaders %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("maxreaders="));
                                exit(EXIT_FAILURE);
                        }
@@ -136,12 +140,12 @@ static void readhdr()
                        if (!dbflags[i].bit) {
                                ptr = memchr(dbuf.mv_data, '=', dbuf.mv_size);
                                if (!ptr) {
-                                       fprintf(stderr, "%s: line %zd: unexpected format\n",
+                                       fprintf(stderr, "%s: line %" Z "d: unexpected format\n",
                                                prog, lineno);
                                        exit(EXIT_FAILURE);
                                } else {
                                        *ptr = '\0';
-                                       fprintf(stderr, "%s: line %zd: unrecognized keyword ignored: %s\n",
+                                       fprintf(stderr, "%s: line %" Z "d: unrecognized keyword ignored: %s\n",
                                                prog, lineno, (char *)dbuf.mv_data);
                                }
                        }
@@ -149,9 +153,9 @@ static void readhdr()
        }
 }
 
-static void badend()
+static void badend(void)
 {
-       fprintf(stderr, "%s: line %zd: unexpected end of input\n",
+       fprintf(stderr, "%s: line %" Z "d: unexpected end of input\n",
                prog, lineno);
 }
 
@@ -178,14 +182,14 @@ static int readline(MDB_val *out, MDB_val *buf)
        if (!(mode & NOHDR)) {
                c = fgetc(stdin);
                if (c == EOF) {
-                       eof = 1;
+                       Eof = 1;
                        return EOF;
                }
                if (c != ' ') {
                        lineno++;
                        if (fgets(buf->mv_data, buf->mv_size, stdin) == NULL) {
 badend:
-                               eof = 1;
+                               Eof = 1;
                                badend();
                                return EOF;
                        }
@@ -195,7 +199,7 @@ badend:
                }
        }
        if (fgets(buf->mv_data, buf->mv_size, stdin) == NULL) {
-               eof = 1;
+               Eof = 1;
                return EOF;
        }
        lineno++;
@@ -207,15 +211,15 @@ badend:
        while (c1[len-1] != '\n') {
                buf->mv_data = realloc(buf->mv_data, buf->mv_size*2);
                if (!buf->mv_data) {
-                       eof = 1;
-                       fprintf(stderr, "%s: line %zd: out of memory, line too long\n",
+                       Eof = 1;
+                       fprintf(stderr, "%s: line %" Z "d: out of memory, line too long\n",
                                prog, lineno);
                        return EOF;
                }
                c1 = buf->mv_data;
                c1 += buf->mv_size;
                if (fgets((char *)c1, buf->mv_size, stdin) == NULL) {
-                       eof = 1;
+                       Eof = 1;
                        badend();
                        return EOF;
                }
@@ -233,8 +237,8 @@ badend:
                                if (c2[1] == '\\') {
                                        c1++; c2 += 2;
                                } else {
-                                       if (c2+3 >= end || !isxdigit(c2[1]) || !isxdigit(c2[2])) {
-                                               eof = 1;
+                                       if (c2+3 > end || !isxdigit(c2[1]) || !isxdigit(c2[2])) {
+                                               Eof = 1;
                                                badend();
                                                return EOF;
                                        }
@@ -248,13 +252,13 @@ badend:
        } else {
                /* odd length not allowed */
                if (len & 1) {
-                       eof = 1;
+                       Eof = 1;
                        badend();
                        return EOF;
                }
                while (c2 < end) {
                        if (!isxdigit(*c2) || !isxdigit(c2[1])) {
-                               eof = 1;
+                               Eof = 1;
                                badend();
                                return EOF;
                        }
@@ -268,7 +272,7 @@ badend:
        return 0;
 }
 
-static void usage()
+static void usage(void)
 {
        fprintf(stderr, "usage: %s dbpath [-V] [-f input] [-n] [-s name] [-N] [-T]\n", prog);
        exit(EXIT_FAILURE);
@@ -288,7 +292,7 @@ int main(int argc, char *argv[])
        prog = argv[0];
 
        if (argc < 2) {
-               usage(prog);
+               usage();
        }
 
        /* -f: load file instead of stdin
@@ -324,12 +328,12 @@ int main(int argc, char *argv[])
                        mode |= NOHDR;
                        break;
                default:
-                       usage(prog);
+                       usage();
                }
        }
 
        if (optind != argc - 1)
-               usage(prog);
+               usage();
 
        dbuf.mv_size = 4096;
        dbuf.mv_data = malloc(dbuf.mv_size);
@@ -339,6 +343,10 @@ int main(int argc, char *argv[])
 
        envname = argv[optind];
        rc = mdb_env_create(&env);
+       if (rc) {
+               fprintf(stderr, "mdb_env_create failed, error %d %s\n", rc, mdb_strerror(rc));
+               return EXIT_FAILURE;
+       }
 
        mdb_env_set_maxdbs(env, 2);
 
@@ -360,7 +368,7 @@ int main(int argc, char *argv[])
        kbuf.mv_size = mdb_env_get_maxkeysize(env) * 2 + 2;
        kbuf.mv_data = malloc(kbuf.mv_size);
 
-       while(!eof) {
+       while(!Eof) {
                MDB_val key, data;
                int batch = 0;
                flags = 0;
@@ -408,7 +416,7 @@ int main(int argc, char *argv[])
                        if (batch == 100) {
                                rc = mdb_txn_commit(txn);
                                if (rc) {
-                                       fprintf(stderr, "%s: line %zd: txn_commit: %s\n",
+                                       fprintf(stderr, "%s: line %" Z "d: txn_commit: %s\n",
                                                prog, lineno, mdb_strerror(rc));
                                        goto env_close;
                                }
@@ -428,7 +436,7 @@ int main(int argc, char *argv[])
                rc = mdb_txn_commit(txn);
                txn = NULL;
                if (rc) {
-                       fprintf(stderr, "%s: line %zd: txn_commit: %s\n",
+                       fprintf(stderr, "%s: line %" Z "d: txn_commit: %s\n",
                                prog, lineno, mdb_strerror(rc));
                        goto env_close;
                }