Просмотр исходного кода

libdpkg: Rename stat variable to st to avoid shadowing stat(2)

Guillem Jover лет назад: 16
Родитель
Сommit
5cf023f2d5
1 измененных файлов с 8 добавлено и 7 удалено
  1. 8 7
      lib/dpkg/parse.c

+ 8 - 7
lib/dpkg/parse.c

@@ -102,7 +102,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
   char *value= NULL;
   char *value= NULL;
   int fieldlen= 0, valuelen= 0;
   int fieldlen= 0, valuelen= 0;
   int *ip, c;
   int *ip, c;
-  struct stat stat;
+  struct stat st;
   struct parsedb_state ps;
   struct parsedb_state ps;
 
 
   ps.filename = filename;
   ps.filename = filename;
@@ -117,20 +117,21 @@ int parsedb(const char *filename, enum parsedbflags flags,
 
 
   push_cleanup(cu_closefd, ~ehflag_normaltidy, NULL, 0, 1, &fd);
   push_cleanup(cu_closefd, ~ehflag_normaltidy, NULL, 0, 1, &fd);
 
 
-  if (fstat(fd, &stat) == -1)
+  if (fstat(fd, &st) == -1)
     ohshite(_("can't stat package info file `%.255s'"),filename);
     ohshite(_("can't stat package info file `%.255s'"),filename);
 
 
-  if (stat.st_size > 0) {
+  if (st.st_size > 0) {
 #ifdef HAVE_MMAP
 #ifdef HAVE_MMAP
-    if ((dataptr= (char *)mmap(NULL, stat.st_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED)
+    dataptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+    if (dataptr == MAP_FAILED)
       ohshite(_("can't mmap package info file `%.255s'"),filename);
       ohshite(_("can't mmap package info file `%.255s'"),filename);
 #else
 #else
-    dataptr = m_malloc(stat.st_size);
+    dataptr = m_malloc(st.st_size);
 
 
-    fd_buf_copy(fd, dataptr, stat.st_size, _("copy info file `%.255s'"),filename);
+    fd_buf_copy(fd, dataptr, st.st_size, _("copy info file `%.255s'"), filename);
 #endif
 #endif
     data= dataptr;
     data= dataptr;
-    endptr= dataptr + stat.st_size;
+    endptr = dataptr + st.st_size;
   } else {
   } else {
     data= dataptr= endptr= NULL;
     data= dataptr= endptr= NULL;
   }
   }