examples/libsmbclient: avoid some compiler warnings

Signed-off-by: Stefan Metzmacher <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]>
heftig · Apr 2, 2014 · c851900 · c851900
1 parent 0b757c9
commit c851900
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/examples/libsmbclient/testacl2.c b/examples/libsmbclient/testacl2.c
@@ -25,14 +25,15 @@ int main(int argc, const char *argv[])
     int ret;
     const char *debugstr;
     char value[1024];
+    SMBCCTX *context;
 
     if (smbc_init(get_auth_data_fn, debug) != 0)
     {
         printf("Could not initialize smbc_ library\n");
         return 1;
     }
 
-    SMBCCTX *context = smbc_set_context(NULL);
+    context = smbc_set_context(NULL);
     smbc_setOptionFullTimeNames(context, 1);
 
     the_acl = strdup("system.nt_sec_desc.*");

diff --git a/examples/libsmbclient/testbrowse.c b/examples/libsmbclient/testbrowse.c
@@ -25,8 +25,7 @@ get_auth_data_with_context_fn(SMBCCTX * context,
                               char * pPassword,
                               int maxLenPassword);
 
-int
-main(int argc, char * argv[])
+int main(int argc, const char *argv[])
 {
     int                         debug = 0;
     int                         debug_stderr = 0;
@@ -73,7 +72,7 @@ main(int argc, char * argv[])
 
     setbuf(stdout, NULL);
 
-    pc = poptGetContext("opendir", argc, (const char **)argv, long_options, 0);
+    pc = poptGetContext("opendir", argc, argv, long_options, 0);
 
     poptSetOtherOptionHelp(pc, "");
 
@@ -100,7 +99,7 @@ main(int argc, char * argv[])
     if (context_auth) {
         smbc_setFunctionAuthDataWithContext(context,
                                             get_auth_data_with_context_fn);
-        smbc_setOptionUserData(context, (void *)"hello world");
+        smbc_setOptionUserData(context, strdup("hello world"));
     } else {
         smbc_setFunctionAuthData(context, get_auth_data_fn);
     }
@@ -126,20 +125,22 @@ main(int argc, char * argv[])
 
     if (scan)
     {
-        for (;
-             iterations == -1 || iterations > 0;
-             iterations = (iterations == -1 ? iterations : --iterations))
-        {
+        for (; iterations != 0;) {
+            if (iterations > 0) {
+                iterations--;
+            }
+
             snprintf(buf, sizeof(buf), "smb://");
             browse(buf, scan, 0);
         }
     }
     else
     {
-        for (;
-             iterations == -1 || iterations > 0;
-             iterations = (iterations == -1 ? iterations : --iterations))
-        {
+        for (; iterations != 0;) {
+            if (iterations > 0) {
+                iterations--;
+            }
+
             fputs("url: ", stdout);
             p = fgets(buf, sizeof(buf), stdin);
             if (! p)

diff --git a/examples/libsmbclient/testctx.c b/examples/libsmbclient/testctx.c
@@ -1,15 +1,16 @@
 #include <libsmbclient.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
-void create_and_destroy_context (void)
+static void create_and_destroy_context (void)
 {
   int i;
   SMBCCTX *ctx;
   ctx = smbc_new_context ();
   /* Both should do the same thing */
   smbc_setOptionDebugToStderr(ctx, 1);
-  smbc_option_set(ctx, "debug_to_stderr", 1);
+  smbc_option_set(ctx, strdup("debug_to_stderr"), 1);
   smbc_setDebug(ctx, 1);
   i = smbc_getDebug(ctx);
   if (i != 1) {