qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warning in nis_table

This commit is contained in:
Ulrich Drepper 2011-11-12 00:18:19 -05:00
parent 8a6d525522
commit ab26144ebb
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-12 Ulrich Drepper <drepper@gmail.com>
* nis/nis_table.c (nis_list): Use variable of correct type for
result of __follow_path call.
2011-11-07 Adhemerval Zanella <azanella@linux.vnet.ibm.com> 2011-11-07 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/fpu/math_private.h: Using inline assembly version * sysdeps/powerpc/fpu/math_private.h: Using inline assembly version

28
nis/nis_table.c
View File

@ -368,12 +368,12 @@ nis_list (const_nis_name name, unsigned int flags,
else if ((flags & FOLLOW_PATH) else if ((flags & FOLLOW_PATH)
&& NIS_RES_STATUS (res) == NIS_PARTIAL) && NIS_RES_STATUS (res) == NIS_PARTIAL)
{ {
clnt_status = __follow_path (&tablepath, &tableptr, ibreq, enum nis_error err = __follow_path (&tablepath, &tableptr,
&bptr); ibreq, &bptr);
if (clnt_status != NIS_SUCCESS) if (err != NIS_SUCCESS)
{ {
if (clnt_status == NIS_NOMEMORY) if (err == NIS_NOMEMORY)
NIS_RES_STATUS (res) = clnt_status; NIS_RES_STATUS (res) = err;
++done; ++done;
} }
else else
@ -428,15 +428,15 @@ nis_list (const_nis_name name, unsigned int flags,
NIS_RES_STATUS (allres) = NIS_RES_STATUS (res); NIS_RES_STATUS (allres) = NIS_RES_STATUS (res);
xdr_free ((xdrproc_t) _xdr_nis_result, (char *) res); xdr_free ((xdrproc_t) _xdr_nis_result, (char *) res);
} }
clnt_status = __follow_path (&tablepath, &tableptr, ibreq, enum nis_error err = __follow_path (&tablepath, &tableptr,
&bptr); ibreq, &bptr);
if (clnt_status != NIS_SUCCESS) if (err != NIS_SUCCESS)
{ {
/* Prepare for the nis_freeresult call. */ /* Prepare for the nis_freeresult call. */
memset (res, '\0', sizeof (*res)); memset (res, '\0', sizeof (*res));
if (clnt_status == NIS_NOMEMORY) if (err == NIS_NOMEMORY)
NIS_RES_STATUS (allres) = clnt_status; NIS_RES_STATUS (allres) = err;
++done; ++done;
} }
} }
@ -453,12 +453,12 @@ nis_list (const_nis_name name, unsigned int flags,
++done; ++done;
else else
{ {
clnt_status enum nis_error err
= __follow_path (&tablepath, &tableptr, ibreq, &bptr); = __follow_path (&tablepath, &tableptr, ibreq, &bptr);
if (clnt_status != NIS_SUCCESS) if (err != NIS_SUCCESS)
{ {
if (clnt_status == NIS_NOMEMORY) if (err == NIS_NOMEMORY)
NIS_RES_STATUS (res) = clnt_status; NIS_RES_STATUS (res) = err;
++done; ++done;
} }
} }