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

libdpkg: Do not pass any argument to standard_shutdown

Guillem Jover лет назад: 18
Родитель
Сommit
c47003c7b2
8 измененных файлов с 12 добавлено и 9 удалено
  1. 5 0
      ChangeLog
  2. 1 1
      dpkg-deb/main.c
  3. 1 1
      dpkg-split/main.c
  4. 1 1
      dselect/main.cc
  5. 1 3
      lib/dpkg.h
  6. 1 1
      src/main.c
  7. 1 1
      src/query.c
  8. 1 1
      src/trigcmd.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-09-14  Guillem Jover  <guillem@debian.org>
+
+	* lib/dpkg.h (standard_shutdown): Remove unused freemem argument,
+	and do not call nffreeall. Fix all callers.
+
 2008-09-14  Guillem Jover  <guillem@debian.org>
 2008-09-14  Guillem Jover  <guillem@debian.org>
 
 
 	* lib/dpkg-db.h: Move <stdlib.h> inclusion to ...
 	* lib/dpkg-db.h: Move <stdlib.h> inclusion to ...

+ 1 - 1
dpkg-deb/main.c

@@ -212,7 +212,7 @@ int main(int argc, const char *const *argv) {
 
 
   unsetenv("GZIP");
   unsetenv("GZIP");
   action(argv);
   action(argv);
-  standard_shutdown(NULL);
+  standard_shutdown();
   exit(0);
   exit(0);
 }
 }
 
 

+ 1 - 1
dpkg-split/main.c

@@ -189,6 +189,6 @@ int main(int argc, const char *const *argv) {
 
 
   if (ferror(stderr)) werr("stderr");
   if (ferror(stderr)) werr("stderr");
   
   
-  standard_shutdown(0);
+  standard_shutdown();
   exit(0);
   exit(0);
 }
 }

+ 1 - 1
dselect/main.cc

@@ -514,7 +514,7 @@ int main(int, const char *const *argv) {
   }
   }
 
 
   cursesoff();
   cursesoff();
-  standard_shutdown(0);
+  standard_shutdown();
   return(0);
   return(0);
 }
 }
 
 

+ 1 - 3
lib/dpkg.h

@@ -165,11 +165,9 @@ extern const char printforhelp[];
   myopt(argv,cmdinfos);\
   myopt(argv,cmdinfos);\
 } while (0)
 } while (0)
 
 
-#define standard_shutdown(freemem) do {\
+#define standard_shutdown() do { \
   set_error_display(NULL, NULL); \
   set_error_display(NULL, NULL); \
   error_unwind(ehflag_normaltidy);\
   error_unwind(ehflag_normaltidy);\
-  if (freemem)\
-    nffreeall();\
 } while (0)
 } while (0)
 
 
 /*** from ehandle.c ***/
 /*** from ehandle.c ***/

+ 1 - 1
src/main.c

@@ -645,7 +645,7 @@ int main(int argc, const char *const *argv) {
 
 
   actionfunction(argv);
   actionfunction(argv);
 
 
-  standard_shutdown(0);
+  standard_shutdown();
 
 
   return reportbroken_retexitstatus();
   return reportbroken_retexitstatus();
 }
 }

+ 1 - 1
src/query.c

@@ -574,7 +574,7 @@ int main(int argc, const char *const *argv) {
 
 
   actionfunction(argv);
   actionfunction(argv);
 
 
-  standard_shutdown(0);
+  standard_shutdown();
 
 
   return reportbroken_retexitstatus();
   return reportbroken_retexitstatus();
 }
 }

+ 1 - 1
src/trigcmd.c

@@ -234,7 +234,7 @@ main(int argc, const char *const *argv)
 		trigdef_process_done();
 		trigdef_process_done();
 	}
 	}
 
 
-	standard_shutdown(0);
+	standard_shutdown();
 
 
 	return 0;
 	return 0;
 }
 }