We don't need optarg when we have popt

(This used to be commit b46581ef153296a0a04f773115cb2ddad4d44686)

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 3ff7f6c609753900bc81a86d0511fc7c2cd87aa2..97cea3a7bbf77b5d2f5068c419caa7322b7f83f8 100644 (file)
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -222,12 +222,12 @@ int main(int argc,char *argv[])
          switch (opt)
          {
          case 'B':
-                 bcast_addr = *interpret_addr2(optarg);
+                 bcast_addr = *interpret_addr2(poptGetOptArg(pc));
                  got_bcast = True;
                  use_bcast = True;
                  break;
          case 'U':
-                 bcast_addr = *interpret_addr2(optarg);
+                 bcast_addr = *interpret_addr2(poptGetOptArg(pc));
                  got_bcast = True;
                  use_bcast = False;
                  break;

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 60243b671be28389e0abeaee8841bff0e5ebc263..22964214be4c012792b2b12b382bf8f2933ac55f 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -188,8 +188,6 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 
 int main(int argc, const char *argv[])
 {
-       extern char *optarg;
-       extern int optind;
        const char *config_file = dyn_CONFIGFILE;
        int s;
        static BOOL silent_mode = False;