Fix a warning on host "gwen"

[ira/wip.git] / librpc / ndr / ndr_basic.c

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index 1d2b47c850b4e246c47f6ad07723fad79c35903b..825f30319ec6f6460f7c2d538facd096f493ab1b 100644 (file)
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -568,9 +568,10 @@ _PUBLIC_ enum ndr_err_code ndr_pull_time_t(struct ndr_pull *ndr, int ndr_flags,
 */
 _PUBLIC_ enum ndr_err_code ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char **address)
 {
+       uint32_t s_addr;
        struct in_addr in;
-       NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &in.s_addr));
-       in.s_addr = htonl(in.s_addr);
+       NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &s_addr));
+       in.s_addr = htonl(s_addr);
        *address = talloc_strdup(ndr->current_mem_ctx, inet_ntoa(in));
        NDR_ERR_HAVE_NO_MEMORY(*address);
        return NDR_ERR_SUCCESS;
@@ -757,8 +758,7 @@ _PUBLIC_ void ndr_print_array_uint8(struct ndr_print *ndr, const char *name,
        ndr->depth++;
        for (i=0;i<count;i++) {
                char *idx=NULL;
-               asprintf(&idx, "[%d]", i);
-               if (idx) {
+               if (asprintf(&idx, "[%d]", i) != -1) {
                        ndr_print_uint8(ndr, idx, data[i]);
                        free(idx);
                }