aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-11-12 00:18:19 -0500
committerUlrich Drepper <drepper@gmail.com>2011-11-12 00:18:19 -0500
commitab26144ebb79009a4cdf50c6768bcb4b2debcdcb (patch)
treedb75e73e3baec3c42c330d686369eb4711836938
parent8a6d525522b2fb04cec86b48c5b25818d395bbbd (diff)
downloadglibc-ab26144ebb79009a4cdf50c6768bcb4b2debcdcb.zip
glibc-ab26144ebb79009a4cdf50c6768bcb4b2debcdcb.tar.gz
glibc-ab26144ebb79009a4cdf50c6768bcb4b2debcdcb.tar.bz2
Fix warning in nis_table
-rw-r--r--ChangeLog5
-rw-r--r--nis/nis_table.c36
2 files changed, 23 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fe09d0..dd1e49f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* sysdeps/powerpc/fpu/math_private.h: Using inline assembly version
diff --git a/nis/nis_table.c b/nis/nis_table.c
index aba2897..c628ed6 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -101,8 +101,8 @@ __create_ib_request (const_nis_name name, unsigned int flags)
}
*val++ = '\0';
if (search_len + 1 >= size)
- {
- size += 1;
+ {
+ size += 1;
nis_attr *newp = realloc (search_val, size * sizeof (nis_attr));
if (newp == NULL)
goto free_null;
@@ -279,8 +279,8 @@ nis_list (const_nis_name name, unsigned int flags,
&dir, &bptr, flags & ~MASTER_ONLY);
if (status != NIS_SUCCESS)
{
- NIS_RES_STATUS (res) = status;
- goto fail3;
+ NIS_RES_STATUS (res) = status;
+ goto fail3;
}
while (__nisbind_connect (&bptr) != NIS_SUCCESS)
@@ -368,12 +368,12 @@ nis_list (const_nis_name name, unsigned int flags,
else if ((flags & FOLLOW_PATH)
&& NIS_RES_STATUS (res) == NIS_PARTIAL)
{
- clnt_status = __follow_path (&tablepath, &tableptr, ibreq,
- &bptr);
- if (clnt_status != NIS_SUCCESS)
+ enum nis_error err = __follow_path (&tablepath, &tableptr,
+ ibreq, &bptr);
+ if (err != NIS_SUCCESS)
{
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (res) = clnt_status;
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (res) = err;
++done;
}
else
@@ -428,15 +428,15 @@ nis_list (const_nis_name name, unsigned int flags,
NIS_RES_STATUS (allres) = NIS_RES_STATUS (res);
xdr_free ((xdrproc_t) _xdr_nis_result, (char *) res);
}
- clnt_status = __follow_path (&tablepath, &tableptr, ibreq,
- &bptr);
- if (clnt_status != NIS_SUCCESS)
+ enum nis_error err = __follow_path (&tablepath, &tableptr,
+ ibreq, &bptr);
+ if (err != NIS_SUCCESS)
{
/* Prepare for the nis_freeresult call. */
memset (res, '\0', sizeof (*res));
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (allres) = clnt_status;
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (allres) = err;
++done;
}
}
@@ -453,12 +453,12 @@ nis_list (const_nis_name name, unsigned int flags,
++done;
else
{
- clnt_status
+ enum nis_error err
= __follow_path (&tablepath, &tableptr, ibreq, &bptr);
- if (clnt_status != NIS_SUCCESS)
+ if (err != NIS_SUCCESS)
{
- if (clnt_status == NIS_NOMEMORY)
- NIS_RES_STATUS (res) = clnt_status;
+ if (err == NIS_NOMEMORY)
+ NIS_RES_STATUS (res) = err;
++done;
}
}