Fixed problem with NULL being changed.

[splint.git] / src / cpplib.c

diff --git a/src/cpplib.c b/src/cpplib.c
index edafd9e7534e0c25fcf91b53b512cd90a8771bd1..d927c7b7193e74e891b6c73fe50eed8bff43fa31 100644 (file)
--- a/src/cpplib.c
+++ b/src/cpplib.c
@@ -373,7 +373,7 @@ typedef unsigned int mode_t;
 
 # endif
 
-static int file_size_and_mode (int p_fd, /*@out@*/ mode_t *p_mode_pointer,
+static int file_size_and_mode (int p_fd, /*@out@*/ __mode_t *p_mode_pointer,
                               /*@out@*/ size_t *p_size_pointer);
 static int safe_read (int p_desc, /*@out@*/ char *p_ptr, int p_len);
 
@@ -7073,7 +7073,7 @@ finclude (cppReader *pfile, int f,
          bool system_header_p,
          /*@dependent@*/ struct file_name_list *dirptr)
 {
-  mode_t st_mode;
+  __mode_t st_mode;
   size_t st_size;
   long i;
   int length = 0;
@@ -7276,14 +7276,14 @@ cppCleanup (/*@special@*/ cppReader *pfile)
 */
 
 static int
-file_size_and_mode (int fd, mode_t *mode_pointer, size_t *size_pointer)
+file_size_and_mode (int fd, __mode_t *mode_pointer, size_t *size_pointer)
 {
   struct stat sbuf;
 
   if (fstat (fd, &sbuf) < 0) {
     *mode_pointer = 0;
     *size_pointer = 0;
-    return (-1);
+    /*@i2@*/ return (-1); /* Spurious warnings! */
   }
 
   if (mode_pointer != NULL)
@@ -7296,7 +7296,7 @@ file_size_and_mode (int fd, mode_t *mode_pointer, size_t *size_pointer)
       *size_pointer = (size_t) sbuf.st_size;
     }
 
-  return 0;
+  /*@i4@*/ return 0; /* spurious warnings here */
 }
 
 /* Read LEN bytes at PTR from descriptor DESC, for file FILENAME,