Eliminate more dead stores.

Found by:	Clang static analyzer
MFC after:	7 days
This commit is contained in:
Garrett Wollman 2009-11-25 04:45:45 +00:00
parent 750a395ba6
commit 0c0349bfa4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=199784
7 changed files with 9 additions and 10 deletions

View File

@ -647,7 +647,7 @@ int
cgetnext(char **bp, char **db_array)
{
size_t len;
int done, hadreaderr, i, savederrno, status;
int done, hadreaderr, savederrno, status;
char *cp, *line, *rp, *np, buf[BSIZE], nbuf[BSIZE];
u_int dummy;
@ -658,7 +658,7 @@ cgetnext(char **bp, char **db_array)
(void)cgetclose();
return (-1);
}
for(;;) {
for (;;) {
if (toprec && !gottoprec) {
gottoprec = 1;
line = toprec;
@ -709,7 +709,6 @@ cgetnext(char **bp, char **db_array)
/*
* Line points to a name line.
*/
i = 0;
done = 0;
np = nbuf;
for (;;) {

View File

@ -124,7 +124,7 @@ _local_initshells(rv, cb_data, ap)
if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
return NS_UNAVAIL;
sp = cp = line;
cp = line;
while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) {
while (*cp != '#' && *cp != '/' && *cp != '\0')
cp++;

View File

@ -320,7 +320,7 @@ we_check(const char *words, int flags)
if (c == '\0' || level != 0)
return (WRDE_SYNTAX);
} else
c = *--words;
--words;
break;
default:
break;

View File

@ -412,13 +412,13 @@ void *handlep;
* Noone needs these entries anymore, then frees them.
* Make sure all info in netconfig_info structure has been reinitialized.
*/
q = p = ni.head;
q = ni.head;
ni.eof = ni.ref = 0;
ni.head = NULL;
ni.tail = NULL;
mutex_unlock(&ni_lock);
while (q) {
while (q != NULL) {
p = q->next;
if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups);
free(q->ncp);

View File

@ -302,7 +302,7 @@ int vers;
void *localhandle;
struct netconfig *nconf;
struct netconfig *tpconf;
struct key_call_private *kcp = key_call_private_main;
struct key_call_private *kcp;
struct timeval wait_time;
struct utsname u;
int main_thread;

View File

@ -89,7 +89,7 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
if (!__mbsinit(&fp->_mbstate))
/* Incomplete character */
goto error;
*wsp++ = L'\0';
*wsp = L'\0';
FUNLOCKFILE(fp);
return (ws);

View File

@ -241,7 +241,7 @@ static bool_t
ypmatch_cache_lookup(struct dom_binding *ypdb, char *map, keydat *key,
valdat *val)
{
struct ypmatch_ent *c = ypdb->cache;
struct ypmatch_ent *c;
ypmatch_cache_expire(ypdb);