Silence bunch of compiler warnings from test programs

diff --git a/lib/tplatform.c b/lib/tplatform.c
index 769bcc9..da55567 100644 (file)
--- a/lib/tplatform.c
+++ b/lib/tplatform.c
@@ -27,7 +27,7 @@ static int rpmPlatform(void)
        goto exit;
     }
 
-    p = b;
+    p = (char *) b;
     for (pe = p; p && *p; p = pe) {
        pe = strchr(p, '\n');
        if (pe)

diff --git a/lib/trb.c b/lib/trb.c
index 153a31a..c0c310e 100644 (file)
--- a/lib/trb.c
+++ b/lib/trb.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
 
     rpmSetVerbosity(RPMLOG_NOTICE);
 
-    optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    optCon = poptGetContext(argv[0], argc, (const char **) argv, optionsTable, 0);
     (void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
 #if RPM_USES_POPTREADDEFAULTCONFIG
     (void) poptReadDefaultConfig(optCon, 1);

diff --git a/rpmdb/tdbi.c b/rpmdb/tdbi.c
index 66ad5a4..c637275 100644 (file)
--- a/rpmdb/tdbi.c
+++ b/rpmdb/tdbi.c
@@ -58,7 +58,7 @@ main(int argc, char *argv[])
        }
        kval = key.data;
        klen = key.size;
-       printf("%3d %.*s\t%p[%d]\n", nrecs, klen, kval, data.data, data.size);
+       printf("%3d %.*s\t%p[%d]\n", nrecs, (int) klen, kval, data.data, data.size);
 
        memset(&key, 0, sizeof(key));
        memset(&data, 0, sizeof(data));

diff --git a/rpmio/tdir.c b/rpmio/tdir.c
index 32b1678..ee829d8 100644 (file)
--- a/rpmio/tdir.c
+++ b/rpmio/tdir.c
@@ -51,7 +51,7 @@ static struct poptOption optionsTable[] = {
 int
 main(int argc, char *argv[])
 {
-    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    poptContext optCon = poptGetContext(argv[0], argc, (const char**) argv, optionsTable, 0);
     int rc;
 
     while ((rc = poptGetNextOpt(optCon)) > 0) {

diff --git a/rpmio/tfts.c b/rpmio/tfts.c
index a96967e..af1c1f8 100644 (file)
--- a/rpmio/tfts.c
+++ b/rpmio/tfts.c
@@ -143,7 +143,7 @@ static struct poptOption optionsTable[] = {
 int
 main(int argc, char *argv[])
 {
-    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    poptContext optCon = poptGetContext(argv[0], argc, (const char **) argv, optionsTable, 0);
     int rc;
 
     while ((rc = poptGetNextOpt(optCon)) > 0) {

diff --git a/rpmio/tget.c b/rpmio/tget.c
index 432a6f3..b6b2b35 100644 (file)
--- a/rpmio/tget.c
+++ b/rpmio/tget.c
@@ -21,13 +21,14 @@ static char * dirpath = DIRPATH;
 static void readFile(const char * path)
 {
     FD_t fd;
+    int xx;
 
 fprintf(stderr, "===== %s\n", path);
     fd = Fopen(path, "r.ufdio");
     if (fd != NULL) {
        char buf[BUFSIZ];
        size_t len = Fread(buf, 1, sizeof(buf), fd);
-       int xx = Fclose(fd);
+       xx = Fclose(fd);
 
        if (len > 0)
            fwrite(buf, 1, len, stderr);
@@ -48,7 +49,7 @@ static struct poptOption optionsTable[] = {
 int
 main(int argc, char *argv[])
 {
-    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    poptContext optCon = poptGetContext(argv[0], argc, (const char **) argv, optionsTable, 0);
     int rc;
 
     while ((rc = poptGetNextOpt(optCon)) > 0) {

diff --git a/rpmio/tglob.c b/rpmio/tglob.c
index 593e733..fe461e8 100644 (file)
--- a/rpmio/tglob.c
+++ b/rpmio/tglob.c
@@ -62,7 +62,7 @@ static struct poptOption optionsTable[] = {
 int
 main(int argc, char *argv[])
 {
-    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    poptContext optCon = poptGetContext(argv[0], argc, (const char **) argv, optionsTable, 0);
     int rc;
 
     while ((rc = poptGetNextOpt(optCon)) > 0) {

diff --git a/rpmio/thkp.c b/rpmio/thkp.c
index 081ad2c..ea9d689 100644 (file)
--- a/rpmio/thkp.c
+++ b/rpmio/thkp.c
@@ -101,7 +101,7 @@ static struct poptOption optionsTable[] = {
 int
 main(int argc, char *argv[])
 {
-    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    poptContext optCon = poptGetContext(argv[0], argc, (const char **) argv, optionsTable, 0);
     int rc;
 
     while ((rc = poptGetNextOpt(optCon)) > 0) {

diff --git a/rpmio/tput.c b/rpmio/tput.c
index 7942054..bb3ba9b 100644 (file)
--- a/rpmio/tput.c
+++ b/rpmio/tput.c
@@ -108,7 +108,7 @@ static struct poptOption optionsTable[] = {
 int
 main(int argc, char *argv[])
 {
-    poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    poptContext optCon = poptGetContext(argv[0], argc, (const char **) argv, optionsTable, 0);
     int rc;
 
     while ((rc = poptGetNextOpt(optCon)) > 0) {

diff --git a/tools/rpminject.c b/tools/rpminject.c
index 538795e..b7eb7ea 100644 (file)
--- a/tools/rpminject.c
+++ b/tools/rpminject.c
@@ -231,9 +231,9 @@ Header headerCopyWithConvert(Header h, cmd_t *cmds[], int ncmds)
        }
 
        if (type == RPM_STRING_ARRAY_TYPE || type == RPM_I18NSTRING_TYPE)
-           free(vals);
+           _free(vals);
        if (nvals)
-           free(nvals);
+           _free(nvals);
     }
 
     headerFreeIterator(headerIter);

diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index aed410e..31b2cd0 100644 (file)
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -295,7 +295,7 @@ main(int argc, char *argv[])
 
     _depends_debug = 1;
 
-    optCon = poptGetContext("rpmsort", argc, argv, optionsTable, 0);
+    optCon = poptGetContext("rpmsort", argc, (const char **) argv, optionsTable, 0);
 #if RPM_USES_POPTREADDEFAULTCONFIG
     poptReadDefaultConfig(optCon, 1);
 #endif