fix a couple of "declaration shadows previous local" warnings.
authorAndrew Tridgell <tridge@samba.org>
Thu, 11 Sep 1997 02:30:00 +0000 (02:30 +0000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 11 Sep 1997 02:30:00 +0000 (02:30 +0000)
(This used to be commit c30f6a74d0e6c256b1d46b28c1f31f1c1f3dd856)

source3/nameannounce.c
source3/utils/smbpasswd.c

index 684ef41258101f388bffafb1715d44b3c2696fa1..96641c2d778dfcf19b5c16e82c6e9989e7aae35a 100644 (file)
@@ -383,7 +383,6 @@ void announce_master(time_t t)
 
   for (d = FIRST_SUBNET; d; d = NEXT_SUBNET_EXCLUDING_WINS(d))
     {
-      struct work_record *work;
       for (work = d->workgrouplist; work; work = work->next)
        {
          if (AM_MASTER(work))
@@ -437,9 +436,10 @@ workgroup %s\n", am_master, work->work_group));
            /* We are the WINS server - query ourselves for the dmb name. */
 
            struct nmb_name netb_name;
-           struct subnet_record *d = 0;
            struct name_record *nr = 0;
+
+          d = NULL;
+
            make_nmb_name(&netb_name, name, type, scope);
 
            if ((nr = find_name_search(&d, &netb_name, FIND_WINS, ipzero)) == 0)
index 161555d52cc2939aa440cc69f9918580d22a0872..92abce8d8fcecabb96d46d3834da79fe5c5a33fb 100644 (file)
@@ -417,10 +417,8 @@ static void usage(char *name)
     /* Create a new smb passwd entry and set it to the given password. */
     {
       int fd;
-      int i;
       int new_entry_length;
       char *new_entry;
-      char *p;
       long offpos;
 
       /* The add user write needs to be atomic - so get the fd from