]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
Cleaned up warnings in rmtab.c and xlog.c
authorSteve Dickson <steved@redhat.com>
Fri, 6 Jun 2008 18:44:48 +0000 (14:44 -0400)
committerSteve Dickson <steved@redhat.com>
Fri, 6 Jun 2008 18:44:48 +0000 (14:44 -0400)
Signed-off-by: Steve Dickson <steved@redhat.com>
support/export/rmtab.c
support/nfs/xlog.c

index 8f392a7e83ffc614bd170b2bc4bead0f59464888..0ce368253736c8cd5d04d7e1698b12222cbd9813 100644 (file)
@@ -23,7 +23,7 @@ int
 rmtab_read(void)
 {
        struct rmtabent         *rep;
-       nfs_export              *exp;
+       nfs_export              *exp = NULL;
 
        setrmtabent("r");
        while ((rep = getrmtabent(1, NULL)) != NULL) {
@@ -31,10 +31,10 @@ rmtab_read(void)
                int                     htype;
                
                htype = client_gettype(rep->r_client);
-               if (htype == MCL_FQDN || htype == MCL_SUBNETWORK
+               if (htype == MCL_FQDN || (htype == MCL_SUBNETWORK
                    && (hp = gethostbyname (rep->r_client))
                    && (hp = hostent_dup (hp),
-                       exp = export_allowed (hp, rep->r_path))) {
+                       (exp = export_allowed (hp, rep->r_path))))) {
                        /* see if the entry already exists, otherwise this was an instantiated
                         * wild card, and we must add it
                         */
index 6820346494862775d8108bd5a49e19ed303ca0db..5ac9ba0e6a4d0657d2d9f9440319522921363cf6 100644 (file)
@@ -133,7 +133,7 @@ xlog_enabled(int fac)
 void
 xlog_backend(int kind, const char *fmt, va_list args)
 {
-       va_list args2;
+       va_list args2 = NULL;
 
        if (!(kind & (L_ALL)) && !(logging && (kind & logmask)))
                return;