diff options
| author | Andrew Tridgell <tridge@samba.org> | 1997-09-11 02:30:00 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1997-09-11 02:30:00 +0000 |
| commit | 77df5c87c69ea7f929df211c41da522248d73cfc (patch) | |
| tree | 2a7ddc8221828b0a621e911502b0f657761bc19b | |
| parent | 6da700d77c85b25d181358c5b63222ac178f3c12 (diff) | |
| download | samba-77df5c87c69ea7f929df211c41da522248d73cfc.tar.gz samba-77df5c87c69ea7f929df211c41da522248d73cfc.tar.bz2 samba-77df5c87c69ea7f929df211c41da522248d73cfc.zip | |
fix a couple of "declaration shadows previous local" warnings.
(This used to be commit c30f6a74d0e6c256b1d46b28c1f31f1c1f3dd856)
| -rw-r--r-- | source3/nameannounce.c | 6 | ||||
| -rw-r--r-- | source3/utils/smbpasswd.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/nameannounce.c b/source3/nameannounce.c index 684ef41258..96641c2d77 100644 --- a/source3/nameannounce.c +++ b/source3/nameannounce.c @@ -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) diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 161555d52c..92abce8d8f 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -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 |