Remove some warnings that were introduced by commit 6ca440c

[nfs-utils.git] / support / nfs / cacheio.c

diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
index f30373402d0888009abd53f07f14da690c45f6dd..55fa45d7e620c458917d0015c3af19fbf39bc452 100644 (file)
--- a/support/nfs/cacheio.c
+++ b/support/nfs/cacheio.c
@@ -148,21 +148,32 @@ void qword_printint(FILE *f, int num)
        fprintf(f, "%d ", num);
 }
 
        fprintf(f, "%d ", num);
 }
 

+void qword_printuint(FILE *f, unsigned int num)
+{
+       fprintf(f, "%u ", num);
+}
+

 int qword_eol(FILE *f)
 {
        int err;
 
        fprintf(f,"\n");
        err = fflush(f);
 int qword_eol(FILE *f)
 {
        int err;
 
        fprintf(f,"\n");
        err = fflush(f);

+       if (err) {
+               xlog_warn("qword_eol: fflush failed: errno %d (%s)",
+                           errno, strerror(errno));
+       }

        /*
         * We must send one line (and one line only) in a single write
         * call.  In case of a write error, libc may accumulate the
         * unwritten data and try to write it again later, resulting in a
         * multi-line write.  So we must explicitly ask it to throw away
        /*
         * We must send one line (and one line only) in a single write
         * call.  In case of a write error, libc may accumulate the
         * unwritten data and try to write it again later, resulting in a
         * multi-line write.  So we must explicitly ask it to throw away

-        * any such cached data:
+        * any such cached data.  But we return any original error
+        * indication to the caller.

         */
        __fpurge(f);
         */
        __fpurge(f);

-       return fflush(f);
+       fflush(f);
+       return err;

 }
 
 
 }
 
 


@@ -230,6 +241,20 @@ int qword_get_int(char **bpp, int *anint)
        return 0;
 }
 
        return 0;
 }
 

+int qword_get_uint(char **bpp, unsigned int *anint)
+{
+       char buf[50];
+       char *ep;
+       unsigned int rv;
+       int len = qword_get(bpp, buf, 50);
+       if (len < 0) return -1;
+       if (len ==0) return -1;
+       rv = strtoul(buf, &ep, 0);
+       if (*ep) return -1;
+       *anint = rv;
+       return 0;
+}
+

 #define READLINE_BUFFER_INCREMENT 2048
 
 int readline(int fd, char **buf, int *lenp)
 #define READLINE_BUFFER_INCREMENT 2048
 
 int readline(int fd, char **buf, int *lenp)


@@ -279,9 +304,8 @@ int readline(int fd, char **buf, int *lenp)
 int
 check_new_cache(void)
 {
 int
 check_new_cache(void)
 {

-       struct stat stb;
-       return  (stat("/proc/fs/nfs/filehandle", &stb) == 0) ||
-               (stat("/proc/fs/nfsd/filehandle", &stb) == 0);
+       return  (access("/proc/fs/nfs/filehandle", F_OK) == 0) ||
+               (access("/proc/fs/nfsd/filehandle", F_OK) == 0);

 }      
 
 
 }