Frederic Cambus <f...@statdns.com> writes: > Hi tech@, > > Here is a diff to fix style.9 offenders in includes. > > Prototypes should not have variable names associated with the types.
IIRC some people just disagree with this rule. Variable names can help the developer, but can also clash with macro definitions. I believe this is why thrkill(2) uses names prefixed with '_'. Maybe we should amend the wording used in style(9) instead. > Comments? OK? ok for auth_setpwd(3), getpwnam_r(3), getpwuid_r(3) and pledge(2). I would leave others as is, or convert them to use prefixed names. > Index: bsd_auth.h > =================================================================== > RCS file: /cvs/src/include/bsd_auth.h,v > retrieving revision 1.10 > diff -u -p -r1.10 bsd_auth.h > --- bsd_auth.h 21 Apr 2014 11:27:34 -0000 1.10 > +++ bsd_auth.h 26 Feb 2017 23:08:15 -0000 > @@ -85,7 +85,7 @@ int auth_call(auth_session_t *, char *, > > int auth_setdata(auth_session_t *, void *, size_t); > int auth_setoption(auth_session_t *, char *, char *); > -int auth_setpwd(auth_session_t *, struct passwd *pwd); > +int auth_setpwd(auth_session_t *, struct passwd *); > void auth_set_va_list(auth_session_t *, __va_list); > > struct passwd *auth_getpwd(auth_session_t *); > Index: icdb.h > =================================================================== > RCS file: /cvs/src/include/icdb.h,v > retrieving revision 1.4 > diff -u -p -r1.4 icdb.h > --- icdb.h 4 Sep 2016 14:51:39 -0000 1.4 > +++ icdb.h 26 Feb 2017 23:08:15 -0000 > @@ -24,20 +24,19 @@ __BEGIN_DECLS > > struct icdb; > > -struct icdb *icdb_new(uint32_t version, uint32_t nentries, uint32_t > entrysize, > - uint32_t nkeys, const uint32_t *keysizes, const uint32_t *keyoffsets); > +struct icdb *icdb_new(uint32_t, uint32_t, uint32_t, uint32_t, > + const uint32_t *, const uint32_t *); > > -struct icdb *icdb_open(const char *name, int flags, uint32_t version); > -int icdb_get(struct icdb *db, void *entry, uint32_t idx); > -int icdb_lookup(struct icdb *db, int keynum, const void *key, void *entry, > - uint32_t *idxp); > -int icdb_nentries(struct icdb *db); > -const void *icdb_entries(struct icdb *db); > -int icdb_update(struct icdb *db, const void *entry, int offset); > -int icdb_add(struct icdb *db, const void *entry); > -int icdb_rehash(struct icdb *db); > -int icdb_save(struct icdb *db, int fd); > -int icdb_close(struct icdb *db); > +struct icdb *icdb_open(const char *, int, uint32_t); > +int icdb_get(struct icdb *, void *, uint32_t); > +int icdb_lookup(struct icdb *, int, const void *, void *, uint32_t *); > +int icdb_nentries(struct icdb *); > +const void *icdb_entries(struct icdb *); > +int icdb_update(struct icdb *, const void *, int); > +int icdb_add(struct icdb *, const void *); > +int icdb_rehash(struct icdb *); > +int icdb_save(struct icdb *, int); > +int icdb_close(struct icdb *); > > __END_DECLS > > Index: pwd.h > =================================================================== > RCS file: /cvs/src/include/pwd.h,v > retrieving revision 1.24 > diff -u -p -r1.24 pwd.h > --- pwd.h 18 Nov 2015 16:44:46 -0000 1.24 > +++ pwd.h 26 Feb 2017 23:08:15 -0000 > @@ -96,9 +96,9 @@ struct passwd *getpwnam(const char *); > struct passwd *getpwuid_shadow(uid_t); > struct passwd *getpwnam_shadow(const char *); > int getpwnam_r(const char *, struct passwd *, char *, size_t, > - struct passwd **result); > -int getpwuid_r(uid_t uid, struct passwd *, char *buf, size_t buflen, > - struct passwd **result); > + struct passwd **); > +int getpwuid_r(uid_t, struct passwd *, char *, size_t, > + struct passwd **); > #if __BSD_VISIBLE || __XPG_VISIBLE > struct passwd *getpwent(void); > void setpwent(void); > Index: signal.h > =================================================================== > RCS file: /cvs/src/include/signal.h,v > retrieving revision 1.25 > diff -u -p -r1.25 signal.h > --- signal.h 9 May 2016 23:55:52 -0000 1.25 > +++ signal.h 26 Feb 2017 23:08:15 -0000 > @@ -124,7 +124,7 @@ int sigaltstack(const struct sigaltstack > int sigblock(int); > int sigsetmask(int); > int sigvec(int, struct sigvec *, struct sigvec *); > -int thrkill(pid_t _tid, int _signum, void *_tcb); > +int thrkill(pid_t, int, void *); > #endif > #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */ > #if __BSD_VISIBLE || __POSIX_VISIBLE >= 199309 || __XPG_VISIBLE >= 500 > Index: unistd.h > =================================================================== > RCS file: /cvs/src/include/unistd.h,v > retrieving revision 1.103 > diff -u -p -r1.103 unistd.h > --- unistd.h 12 Sep 2016 19:36:26 -0000 1.103 > +++ unistd.h 26 Feb 2017 23:08:15 -0000 > @@ -519,10 +519,10 @@ int setresgid(gid_t, gid_t, gid_t); > int setresuid(uid_t, uid_t, uid_t); > void setusershell(void); > int strtofflags(char **, u_int32_t *, u_int32_t *); > -int swapctl(int cmd, const void *arg, int misc); > +int swapctl(int, const void *, int); > int syscall(int, ...); > int getentropy(void *, size_t); > -int pledge(const char *, const char **paths); > +int pledge(const char *, const char **); > pid_t __tfork_thread(const struct __tfork *, size_t, void (*)(void > *), > void *); > #endif /* __BSD_VISIBLE */ > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
