diff options
author | kevlo <kevlo@FreeBSD.org> | 2007-11-07 10:53:41 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2007-11-07 10:53:41 +0000 |
commit | fa3791e1a7df72dae386c39862c6dad9fb7a5304 (patch) | |
tree | 368b0b244e9ff1e4d1d1e563ee72dc5168999272 /usr.sbin/pkg_install | |
parent | 350f518402f17e189d71fde9dc889b50554369e6 (diff) | |
download | FreeBSD-src-fa3791e1a7df72dae386c39862c6dad9fb7a5304.zip FreeBSD-src-fa3791e1a7df72dae386c39862c6dad9fb7a5304.tar.gz |
Cleanup of userland __P use
Diffstat (limited to 'usr.sbin/pkg_install')
-rw-r--r-- | usr.sbin/pkg_install/add/main.c | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/create/main.c | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/delete/main.c | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/info/main.c | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/sign/extern.h | 42 | ||||
-rw-r--r-- | usr.sbin/pkg_install/sign/gzip.h | 16 | ||||
-rw-r--r-- | usr.sbin/pkg_install/sign/pgp.h | 16 | ||||
-rw-r--r-- | usr.sbin/pkg_install/sign/stand.h | 6 | ||||
-rw-r--r-- | usr.sbin/pkg_install/version/main.c | 2 |
9 files changed, 45 insertions, 45 deletions
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index 33c63ecc..30257df 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -90,7 +90,7 @@ struct { static char *getpackagesite(void); int getosreldate(void); -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index 8a16dd0..c35cfd6 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -48,7 +48,7 @@ enum zipper Zipper = GZIP; #endif -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index b81b79a..6bf0762 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -37,7 +37,7 @@ Boolean NoDeInstall = FALSE; Boolean Recursive = FALSE; match_t MatchType = MATCH_GLOB; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index 90351b2..74081bb 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -39,7 +39,7 @@ char *LookUpOrigin = NULL; Boolean KeepPackage = FALSE; struct which_head *whead; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h index e7c0076..12a1ab5 100644 --- a/usr.sbin/pkg_install/sign/extern.h +++ b/usr.sbin/pkg_install/sign/extern.h @@ -45,19 +45,19 @@ extern int quiet; extern char *userkey; /* common.c */ -extern int read_header_and_diagnose __P((FILE *file, \ +extern int read_header_and_diagnose(FILE *file, \ /*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \ - const char *filename)); -extern int reap __P((pid_t pid)); + const char *filename); +extern int reap(pid_t pid); /* sign.c */ -extern int sign __P((/*@observer@*/const char *filename, int type, \ - /*@null@*/const char *userid, char *envp[])); +extern int sign(/*@observer@*/const char *filename, int type, \ + /*@null@*/const char *userid, char *envp[]); /* check.c */ -extern int check_signature __P((/*@dependent@*/FILE *file, \ +extern int check_signature(/*@dependent@*/FILE *file, \ /*@null@*/const char *userid, char *envp[], \ - /*@observer@*/const char *filename)); + /*@observer@*/const char *filename); #define PKG_BADSIG 0 #define PKG_GOODSIG 1 @@ -72,29 +72,29 @@ typedef /*@observer@*/char *pchar; /* sha1.c */ #define SHA1_DB_NAME "/var/db/pkg/SHA1" -extern void *new_sha1_checker __P((struct mygzip_header *h, \ +extern void *new_sha1_checker(struct mygzip_header *h, \ struct signature *sign, const char *userid, char *envp[], \ - const char *filename)); + const char *filename); -extern void sha1_add __P((void *arg, const char *buffer, \ - size_t length)); +extern void sha1_add(void *arg, const char *buffer, \ + size_t length); -extern int sha1_sign_ok __P((void *arg)); +extern int sha1_sign_ok(void *arg); -extern int retrieve_sha1_marker __P((const char *filename, \ - struct signature **sign, const char *userid)); +extern int retrieve_sha1_marker(const char *filename, \ + struct signature **sign, const char *userid); /* x509.c */ #define X509_DB_NAME "/var/db/pkg/X509" -extern void *new_x509_checker __P((struct mygzip_header *h, \ +extern void *new_x509_checker(struct mygzip_header *h, \ struct signature *sign, const char *userid, char *envp[], \ - const char *filename)); + const char *filename); -extern void x509_add __P((void *arg, const char *buffer, \ - size_t length)); +extern void x509_add(void *arg, const char *buffer, \ + size_t length); -extern int x509_sign_ok __P((void *arg)); +extern int x509_sign_ok(void *arg); -extern int retrieve_x509_marker __P((const char *filename, \ - struct signature **sign, const char *userid)); +extern int retrieve_x509_marker(const char *filename, \ + struct signature **sign, const char *userid); diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h index 238010f..7db388e 100644 --- a/usr.sbin/pkg_install/sign/gzip.h +++ b/usr.sbin/pkg_install/sign/gzip.h @@ -68,21 +68,21 @@ struct signature { #define GZIP_SIGNED 1 /* gzip file, signature parsed ok */ #define GZIP_NOT_GZIP 2 /* not a proper gzip file */ #define GZIP_NOT_PGPSIGNED 3 /* gzip file, unknown extension */ -extern int gzip_read_header __P((FILE *f, /*@out@*/struct mygzip_header *h, \ - /*@null@*/struct signature **sign)); +extern int gzip_read_header(FILE *f, /*@out@*/struct mygzip_header *h, \ + /*@null@*/struct signature **sign); /* gzip_write_header returns 1 for success */ -extern int gzip_write_header __P((FILE *f, const struct mygzip_header *h, \ - /*@null@*/struct signature *sign)); +extern int gzip_write_header(FILE *f, const struct mygzip_header *h, \ + /*@null@*/struct signature *sign); /* * Writing header to memory. Returns size needed, or 0 if buffer too small * buffer must be at least 14 characters */ -extern int gzip_copy_header __P((const struct mygzip_header *h, \ +extern int gzip_copy_header(const struct mygzip_header *h, \ /*@null@*/struct signature *sign, \ - void (*add)(void *, const char *, size_t), void *data)); + void (*add)(void *, const char *, size_t), void *data); -extern void free_signature __P((/*@null@*/struct signature *sign)); -extern void sign_fill_tag __P((struct signature *sign)); +extern void free_signature(/*@null@*/struct signature *sign); +extern void sign_fill_tag(struct signature *sign); #define KNOWN_TAGS 4 #define TAG_PGP 0 #define TAG_SHA1 1 diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h index 99476f2..db70a8b 100644 --- a/usr.sbin/pkg_install/sign/pgp.h +++ b/usr.sbin/pkg_install/sign/pgp.h @@ -10,16 +10,16 @@ struct mygzip_header; struct signature; -extern void *new_pgp_checker __P((struct mygzip_header *h, \ +extern void *new_pgp_checker(struct mygzip_header *h, \ struct signature *sign, const char *userid, char *envp[], \ - const char *filename)); + const char *filename); -extern void pgp_add __P((void *arg, const char *buffer, \ - size_t length)); +extern void pgp_add(void *arg, const char *buffer, \ + size_t length); -extern int pgp_sign_ok __P((void *arg)); +extern int pgp_sign_ok(void *arg); -extern void handle_pgp_passphrase __P((void)); +extern void handle_pgp_passphrase(void); -extern int retrieve_pgp_signature __P((const char *filename, \ -struct signature **sign, const char *userid, char *envp[])); +extern int retrieve_pgp_signature(const char *filename, \ +struct signature **sign, const char *userid, char *envp[]); diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h index dbc3d69..d641867 100644 --- a/usr.sbin/pkg_install/sign/stand.h +++ b/usr.sbin/pkg_install/sign/stand.h @@ -18,10 +18,10 @@ #if defined(BSD4_4) #include <err.h> #else -extern void warn __P((const char *fmt, ...)); -extern void warnx __P((const char *fmt, ...)); +extern void warn(const char *fmt, ...); +extern void warnx(const char *fmt, ...); #endif -extern void set_program_name __P((const char * name)); +extern void set_program_name(const char * name); #ifndef __GNUC__ #define __attribute__(x) diff --git a/usr.sbin/pkg_install/version/main.c b/usr.sbin/pkg_install/version/main.c index 362bd75..6ccf7c1 100644 --- a/usr.sbin/pkg_install/version/main.c +++ b/usr.sbin/pkg_install/version/main.c @@ -35,7 +35,7 @@ Boolean RegexExtended = FALSE; Boolean UseINDEXOnly = FALSE; Boolean ShowOrigin = FALSE; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) |