Module Name: src
Committed By: joerg
Date: Tue Aug 30 21:10:29 UTC 2011
Modified Files:
src/usr.sbin/ypserv/makedbm: makedbm.c
src/usr.sbin/ypserv/mkalias: mkalias.c
src/usr.sbin/ypserv/mknetid: mknetid.c
src/usr.sbin/ypserv/revnetgroup: revnetgroup.c
src/usr.sbin/ypserv/stdethers: stdethers.c
src/usr.sbin/ypserv/stdhosts: stdhosts.c
src/usr.sbin/ypserv/yppush: yppush.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/ypserv/makedbm/makedbm.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/ypserv/mkalias/mkalias.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/ypserv/mknetid/mknetid.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/ypserv/revnetgroup/revnetgroup.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/ypserv/stdethers/stdethers.c
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/ypserv/stdhosts/stdhosts.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/ypserv/yppush/yppush.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ypserv/makedbm/makedbm.c
diff -u src/usr.sbin/ypserv/makedbm/makedbm.c:1.24 src/usr.sbin/ypserv/makedbm/makedbm.c:1.25
--- src/usr.sbin/ypserv/makedbm/makedbm.c:1.24 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/makedbm/makedbm.c Tue Aug 30 21:10:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: makedbm.c,v 1.24 2009/10/20 00:51:14 snj Exp $ */
+/* $NetBSD: makedbm.c,v 1.25 2011/08/30 21:10:28 joerg Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: makedbm.c,v 1.24 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: makedbm.c,v 1.25 2011/08/30 21:10:28 joerg Exp $");
#endif
#include <sys/param.h>
@@ -50,13 +50,12 @@
#include "ypdb.h"
#include "ypdef.h"
-int main(int, char *[]);
-void usage(void);
-int add_record(DBM *, const char *, const char *, int);
-char *file_date(char *);
-void list_database(char *);
-void create_database(char *, char *, char *, char *, char *, char *,
- int, int, int);
+__dead static void usage(void);
+static int add_record(DBM *, const char *, const char *, int);
+static char *file_date(char *);
+static void list_database(char *);
+static void create_database(char *, char *, char *, char *, char *,
+ char *, int, int, int);
int
main(int argc, char *argv[])
@@ -143,7 +142,7 @@
exit(0);
}
-int
+static int
add_record(DBM *db, const char *str1, const char *str2, int check)
{
datum key, val;
@@ -169,7 +168,7 @@
return 0;
}
-char *
+static char *
file_date(char *filename)
{
struct stat finfo;
@@ -190,7 +189,7 @@
return datestr;
}
-void
+static void
list_database(char *database)
{
DBM *db;
@@ -220,7 +219,7 @@
ypdb_close(db);
}
-void
+static void
create_database(char *infile, char *database, char *yp_input_file,
char *yp_output_file, char *yp_master_name,
char *yp_domain_name, int bflag, int lflag, int sflag)
@@ -346,7 +345,7 @@
}
}
-void
+static void
usage(void)
{
Index: src/usr.sbin/ypserv/mkalias/mkalias.c
diff -u src/usr.sbin/ypserv/mkalias/mkalias.c:1.17 src/usr.sbin/ypserv/mkalias/mkalias.c:1.18
--- src/usr.sbin/ypserv/mkalias/mkalias.c:1.17 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/mkalias/mkalias.c Tue Aug 30 21:10:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkalias.c,v 1.17 2009/10/20 00:51:14 snj Exp $ */
+/* $NetBSD: mkalias.c,v 1.18 2011/08/30 21:10:28 joerg Exp $ */
/*
* Copyright (c) 1997 Mats O Jansson <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mkalias.c,v 1.17 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: mkalias.c,v 1.18 2011/08/30 21:10:28 joerg Exp $");
#endif
#include <sys/types.h>
@@ -52,13 +52,12 @@
#include "ypdb.h"
#include "ypdef.h"
-void capitalize(char *, int);
-int check_host(char *, char *, int, int, int);
-int main(int, char *[]);
-void split_address(char *, int, char *, char *);
-void usage(void);
+static void capitalize(char *, int);
+static int check_host(char *, char *, int, int, int);
+static void split_address(char *, int, char *, char *);
+__dead static void usage(void);
-void
+static void
split_address(char *address, int len, char *user, char *host)
{
char *c, *s, *r;
@@ -95,7 +94,7 @@
}
}
-int
+static int
check_host(char *address, char *host, int dflag, int uflag, int Eflag)
{
u_char answer[PACKETSZ];
@@ -119,7 +118,7 @@
return(status == -1);
}
-void
+static void
capitalize(char *name, int len)
{
char last = ' ';
@@ -331,7 +330,7 @@
exit(0);
}
-void
+static void
usage(void)
{
fprintf(stderr,
Index: src/usr.sbin/ypserv/mknetid/mknetid.c
diff -u src/usr.sbin/ypserv/mknetid/mknetid.c:1.17 src/usr.sbin/ypserv/mknetid/mknetid.c:1.18
--- src/usr.sbin/ypserv/mknetid/mknetid.c:1.17 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/mknetid/mknetid.c Tue Aug 30 21:10:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mknetid.c,v 1.17 2009/10/20 00:51:14 snj Exp $ */
+/* $NetBSD: mknetid.c,v 1.18 2011/08/30 21:10:28 joerg Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mknetid.c,v 1.17 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: mknetid.c,v 1.18 2011/08/30 21:10:28 joerg Exp $");
#endif
/*
@@ -65,21 +65,20 @@
#define HASHMAX 55
-void add_group(const char *, const char *);
-void add_user(const char *, const char *, const char *);
-int hashidx(char);
-int isgsep(char);
-int main(int, char *[]);
-void print_hosts(const char *, const char *);
-void print_netid(const char *);
-void print_passwd_group(int, const char *);
-void read_group(const char *);
-void read_passwd(const char *);
-void usage(void);
+static void add_group(const char *, const char *);
+static void add_user(const char *, const char *, const char *);
+static int hashidx(char);
+static int isgsep(char);
+static void print_hosts(const char *, const char *);
+static void print_netid(const char *);
+static void print_passwd_group(int, const char *);
+static void read_group(const char *);
+static void read_passwd(const char *);
+__dead static void usage(void);
TAILQ_HEAD(user_list, user);
-struct user_list root;
-struct user_list hroot[HASHMAX];
+static struct user_list root;
+static struct user_list hroot[HASHMAX];
int
main(int argc, char *argv[])
@@ -146,7 +145,7 @@
exit (0);
}
-int
+static int
hashidx(char key)
{
if (key < 'A')
@@ -164,7 +163,7 @@
return(54);
}
-void
+static void
add_user(const char *username, const char *uid, const char *gid)
{
struct user *u;
@@ -189,7 +188,7 @@
TAILQ_INSERT_TAIL((&hroot[idx]), u, hash);
}
-void
+static void
add_group(const char *username, const char *gid)
{
struct user *u;
@@ -211,7 +210,7 @@
}
}
-void
+static void
read_passwd(const char *fname)
{
FILE *pfile;
@@ -271,7 +270,7 @@
(void)fclose(pfile);
}
-int
+static int
isgsep(char ch)
{
@@ -286,7 +285,7 @@
return (0);
}
-void
+static void
read_group(const char *fname)
{
FILE *gfile;
@@ -354,7 +353,7 @@
(void)fclose(gfile);
}
-void
+static void
print_passwd_group(int qflag, const char *domain)
{
struct user *u, *p;
@@ -380,7 +379,7 @@
}
}
-void
+static void
print_hosts(const char *fname, const char *domain)
{
FILE *hfile;
@@ -413,7 +412,7 @@
(void) fclose(hfile);
}
-void
+static void
print_netid(const char *fname)
{
FILE *mfile;
@@ -446,7 +445,7 @@
}
}
-void
+static void
usage(void)
{
Index: src/usr.sbin/ypserv/revnetgroup/revnetgroup.c
diff -u src/usr.sbin/ypserv/revnetgroup/revnetgroup.c:1.14 src/usr.sbin/ypserv/revnetgroup/revnetgroup.c:1.15
--- src/usr.sbin/ypserv/revnetgroup/revnetgroup.c:1.14 Sun Apr 19 06:06:40 2009
+++ src/usr.sbin/ypserv/revnetgroup/revnetgroup.c Tue Aug 30 21:10:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: revnetgroup.c,v 1.14 2009/04/19 06:06:40 lukem Exp $ */
+/* $NetBSD: revnetgroup.c,v 1.15 2011/08/30 21:10:29 joerg Exp $ */
/*
* Copyright (c) 1995
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: revnetgroup.c,v 1.14 2009/04/19 06:06:40 lukem Exp $");
+__RCSID("$NetBSD: revnetgroup.c,v 1.15 2011/08/30 21:10:29 joerg Exp $");
#endif
#include <ctype.h>
@@ -55,8 +55,7 @@
#include "hash.h"
#include "protos.h"
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
@@ -72,7 +71,7 @@
*/
struct member_entry *mtable[TABLESIZE];
-void
+static void
usage(void)
{
Index: src/usr.sbin/ypserv/stdethers/stdethers.c
diff -u src/usr.sbin/ypserv/stdethers/stdethers.c:1.18 src/usr.sbin/ypserv/stdethers/stdethers.c:1.19
--- src/usr.sbin/ypserv/stdethers/stdethers.c:1.18 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/stdethers/stdethers.c Tue Aug 30 21:10:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stdethers.c,v 1.18 2009/10/20 00:51:14 snj Exp $ */
+/* $NetBSD: stdethers.c,v 1.19 2011/08/30 21:10:29 joerg Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: stdethers.c,v 1.18 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: stdethers.c,v 1.19 2011/08/30 21:10:29 joerg Exp $");
#endif
#include <sys/types.h>
@@ -45,8 +45,7 @@
#include "protos.h"
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
int
@@ -90,7 +89,7 @@
return 0;
}
-void
+static void
usage(void)
{
Index: src/usr.sbin/ypserv/stdhosts/stdhosts.c
diff -u src/usr.sbin/ypserv/stdhosts/stdhosts.c:1.19 src/usr.sbin/ypserv/stdhosts/stdhosts.c:1.20
--- src/usr.sbin/ypserv/stdhosts/stdhosts.c:1.19 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/ypserv/stdhosts/stdhosts.c Tue Aug 30 21:10:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stdhosts.c,v 1.19 2009/10/20 00:51:14 snj Exp $ */
+/* $NetBSD: stdhosts.c,v 1.20 2011/08/30 21:10:29 joerg Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: stdhosts.c,v 1.19 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: stdhosts.c,v 1.20 2011/08/30 21:10:29 joerg Exp $");
#endif
#include <sys/types.h>
@@ -46,8 +46,7 @@
#include "protos.h"
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -125,7 +124,7 @@
exit(0);
}
-void
+static void
usage(void)
{
Index: src/usr.sbin/ypserv/yppush/yppush.c
diff -u src/usr.sbin/ypserv/yppush/yppush.c:1.23 src/usr.sbin/ypserv/yppush/yppush.c:1.24
--- src/usr.sbin/ypserv/yppush/yppush.c:1.23 Tue Feb 1 20:59:41 2011
+++ src/usr.sbin/ypserv/yppush/yppush.c Tue Aug 30 21:10:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yppush.c,v 1.23 2011/02/01 20:59:41 chuck Exp $ */
+/* $NetBSD: yppush.c,v 1.24 2011/08/30 21:10:29 joerg Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor
@@ -89,11 +89,10 @@
* prototypes
*/
-int main(int, char *[]);
-int pushit(int, char *, int, char *, int, char *);
+static int pushit(int, char *, int, char *, int, char *);
void push(char *, int, struct yppush_info *);
void _svc_run(void);
-void usage(void);
+__dead static void usage(void);
/*
@@ -278,7 +277,7 @@
/*
* usage: print usage and exit
*/
-void
+static void
usage(void)
{
fprintf(stderr, "usage: %s [-d domain] [-h host] [-v] map\n",
@@ -290,7 +289,7 @@
* pushit: called from yp_all_host to push a specific host.
* the key/value pairs are from the ypservers map.
*/
-int
+static int
pushit(int instatus, char *inkey, int inkeylen, char *inval,
int invallen, char *indata)
{
