diff options
| author | ajs <ajs> | 2004-12-03 16:36:46 +0000 |
|---|---|---|
| committer | ajs <ajs> | 2004-12-03 16:36:46 +0000 |
| commit | 887c44a4f3d8219dc5b1c52b5dcde1f31d52b73d (patch) | |
| tree | 5c0ef5fe1d3948c56e6abf2ffd3c9811e92f0f2e /lib | |
| parent | bec595ada58ebfa98ad49220f29ab28b58549094 (diff) | |
2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* bgp_main.c: (sigint) Use zlog_notice for termination message.
(main) Use zlog_notice for startup announcement.
* isis_main.c: (sigint,sigterm) Use zlog_notice for termination message.
(terminate) This function should be static, not global.
(main) Use zlog_notice for startup announcement, and remove
ifdef ZEBRA_VERSION.
* version.h.in: Remove declaration for pid_output_lock, this function
is now static, not global.
* pid_output.c: (pid_output_lock) This function should be static, not
global. And remove "old umask" error message, since it was really
an unimportant debug message, not an error.
(pid_output) Need to declare static function pid_output_lock.
* ospf6_main.c: (sigint,sigterm) Use zlog_notice for termination
message.
(main) Remove commented-out call to pid_output_lock (which should
never be called other than from inside pid_output). And use
zlog_notice to print the startup message, which now includes
the vty port.
* ospf_main.c: (sigint) Use zlog_notice for termination message.
(main) Issue a startup announcement using zlog_notice.
* rip_main.c: (sigint) Use zlog_notice for termination message.
(main) Add a startup announcement using zlog_notice.
* ripng_main.c: (sighup) Remove spurious terminating message.
(sigint) Use zlog_notice for termination message.
(main) Issue a startup announcement using zlog_notice.
* main.c: (sigint) Use zlog_notice for termination message.
(main) Add a startup announcement using zlog_notice.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 9 | ||||
| -rw-r--r-- | lib/pid_output.c | 5 | ||||
| -rw-r--r-- | lib/version.h.in | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 8dde0eb5..84a578dd 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,12 @@ +2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * version.h.in: Remove declaration for pid_output_lock, this function + is now static, not global. + * pid_output.c: (pid_output_lock) This function should be static, not + global. And remove "old umask" error message, since it was really + an unimportant debug message, not an error. + (pid_output) Need to declare static function pid_output_lock. + 2004-11-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * log.h: Remove several unused fields from struct zlog. Add comments diff --git a/lib/pid_output.c b/lib/pid_output.c index ae3393c1..11e1243d 100644 --- a/lib/pid_output.c +++ b/lib/pid_output.c @@ -47,12 +47,14 @@ pid_output (const char *path) umask(oldumask); return pid; #else + static pid_t pid_output_lock (const char *); + return pid_output_lock(path); #endif /* HAVE_FCNTL */ } #ifdef HAVE_FCNTL -pid_t +static pid_t pid_output_lock (const char *path) { int tmp; @@ -65,7 +67,6 @@ pid_output_lock (const char *path) pid = getpid (); oldumask = umask(0777 & ~LOGFILE_MASK); - zlog_err( "old umask %d %d", oldumask, 0777 & ~LOGFILE_MASK); fd = open (path, O_RDWR | O_CREAT, LOGFILE_MASK); if (fd < 0) { diff --git a/lib/version.h.in b/lib/version.h.in index 9a707d4a..cc7c6ca6 100644 --- a/lib/version.h.in +++ b/lib/version.h.in @@ -35,7 +35,6 @@ #define QUAGGA_COPYRIGHT "Copyright 1996-2004 Kunihiro Ishiguro, et al." pid_t pid_output (const char *); -pid_t pid_output_lock (const char *); #ifndef HAVE_DAEMON int daemon(int, int); |