Selaa lähdekoodia

libdpkg: Rename voidfnp to void_func

Guillem Jover 16 vuotta sitten
vanhempi
commit
7129d94739
2 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 3 3
      lib/dpkg/myopt.h
  2. 1 1
      src/main.c

+ 3 - 3
lib/dpkg/myopt.h

@@ -25,7 +25,7 @@
 
 
 DPKG_BEGIN_DECLS
 DPKG_BEGIN_DECLS
 
 
-typedef void (*voidfnp)(void);
+typedef void (*void_func)(void);
 
 
 struct cmdinfo {
 struct cmdinfo {
   const char *olong;
   const char *olong;
@@ -36,7 +36,7 @@ struct cmdinfo {
   void (*call)(const struct cmdinfo*, const char *value);
   void (*call)(const struct cmdinfo*, const char *value);
   int arg;
   int arg;
   void *parg;
   void *parg;
-  voidfnp farg;
+  void_func farg;
 };
 };
 
 
 extern const char printforhelp[];
 extern const char printforhelp[];
@@ -58,7 +58,7 @@ void setaction(const struct cmdinfo *cip, const char *value);
 void setobsolete(const struct cmdinfo *cip, const char *value);
 void setobsolete(const struct cmdinfo *cip, const char *value);
 
 
 #define ACTION(longopt, shortopt, code, func) \
 #define ACTION(longopt, shortopt, code, func) \
- { longopt, shortopt, 0, NULL, NULL, setaction, code, NULL, (voidfnp)func }
+ { longopt, shortopt, 0, NULL, NULL, setaction, code, NULL, (void_func)func }
 #define OBSOLETE(longopt, shortopt) \
 #define OBSOLETE(longopt, shortopt) \
  { longopt, shortopt, 0, NULL, NULL, setobsolete, 0, NULL, NULL }
  { longopt, shortopt, 0, NULL, NULL, setobsolete, 0, NULL, NULL }
 
 

+ 1 - 1
src/main.c

@@ -453,7 +453,7 @@ static const struct cmdinfo cmdinfos[]= {
    * have a very similar structure.
    * have a very similar structure.
    */
    */
 #define ACTIONBACKEND(longopt, shortopt, backend) \
 #define ACTIONBACKEND(longopt, shortopt, backend) \
- { longopt, shortopt, 0, NULL, NULL, setaction, 0, (void *)backend, (voidfnp)execbackend }
+ { longopt, shortopt, 0, NULL, NULL, setaction, 0, (void *)backend, (void_func)execbackend }
 
 
   ACTION( "install",                        'i', act_install,              archivefiles    ),
   ACTION( "install",                        'i', act_install,              archivefiles    ),
   ACTION( "unpack",                          0,  act_unpack,               archivefiles    ),
   ACTION( "unpack",                          0,  act_unpack,               archivefiles    ),