Selaa lähdekoodia

libdpkg: Rename print_error_fatal() to print_fatal_error()

Guillem Jover 15 vuotta sitten
vanhempi
commit
ec53fd98f3
7 muutettua tiedostoa jossa 9 lisäystä ja 7 poistoa
  1. 1 1
      dselect/main.cc
  2. 1 1
      lib/dpkg/dpkg.h
  3. 3 1
      lib/dpkg/ehandle.c
  4. 1 1
      lib/dpkg/ehandle.h
  5. 1 1
      lib/dpkg/libdpkg.Versions
  6. 1 1
      lib/dpkg/test.h
  7. 1 1
      src/main.c

+ 1 - 1
dselect/main.cc

@@ -509,7 +509,7 @@ int main(int, const char *const *argv) {
     cursesoff();
     catch_fatal_error();
   }
-  push_error_handler(&ejbuf,print_error_fatal,0);
+  push_error_handler(&ejbuf, print_fatal_error, 0);
 
   loadcfgfile(DSELECT, cmdinfos);
   myopt(&argv,cmdinfos);

+ 1 - 1
lib/dpkg/dpkg.h

@@ -110,7 +110,7 @@ DPKG_BEGIN_DECLS
   if (setjmp(*ejbuf)) { /* expect warning about possible clobbering of argv */\
     catch_fatal_error(); \
   }\
-  push_error_handler(ejbuf, print_error_fatal, NULL); \
+  push_error_handler(ejbuf, print_fatal_error, NULL); \
   umask(022); /* Make sure all our status databases are readable. */\
 } while (0)
 

+ 3 - 1
lib/dpkg/ehandle.c

@@ -272,7 +272,9 @@ catch_fatal_error(void)
   exit(2);
 }
 
-void print_error_fatal(const char *emsg, const char *contextstring) {
+void
+print_fatal_error(const char *emsg, const char *contextstring)
+{
   fprintf(stderr, "%s: %s\n",thisname,emsg);
 }
 

+ 1 - 1
lib/dpkg/ehandle.h

@@ -42,7 +42,7 @@ enum {
 
 typedef void error_printer(const char *emsg, const char *contextstring);
 
-void print_error_fatal(const char *emsg, const char *contextstring);
+void print_fatal_error(const char *emsg, const char *contextstring);
 void catch_fatal_error(void);
 
 void push_error_handler(jmp_buf *jbufp, error_printer *printerror,

+ 1 - 1
lib/dpkg/libdpkg.Versions

@@ -10,7 +10,7 @@ local:
 LIBDPKG_PRIVATE {
 	# Error handling
 	set_error_display;
-	print_error_fatal;
+	print_fatal_error;
 	catch_fatal_error;
 	push_error_handler;
 	push_checkpoint;

+ 1 - 1
lib/dpkg/test.h

@@ -49,7 +49,7 @@ main(int argc, char **argv)
 	if (setjmp(ejbuf)) {
 		catch_fatal_error();
 	}
-	push_error_handler(&ejbuf, print_error_fatal, NULL);
+	push_error_handler(&ejbuf, print_fatal_error, NULL);
 
 	test();
 

+ 1 - 1
src/main.c

@@ -595,7 +595,7 @@ void commandfd(const char *const *argv) {
     bool mode = false;
     int argc= 1;
     lno= 0;
-    push_error_handler(&ejbuf, print_error_fatal, NULL);
+    push_error_handler(&ejbuf, print_fatal_error, NULL);
 
     do { c= getc(in); if (c == '\n') lno++; } while (c != EOF && isspace(c));
     if (c == EOF) break;