diff options
author | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
---|---|---|
committer | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
commit | c1bdabf8dd2f22a33fdc35b70b93e871f179445d (patch) | |
tree | 570e66e842fc556fc643e97aa37e0183ded19f56 /lib/log.h | |
parent | db59fcc9e02b5755a92e4d2913420c1e09e05517 (diff) | |
parent | 9334b80b2c84f33d0d749b4a172f1d87a77a8544 (diff) | |
download | quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.bz2 quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.xz |
Merge branch 'upstream' into hollywood
Conflicts:
ChangeLog
zebra/zebra_rib.c
Diffstat (limited to 'lib/log.h')
-rw-r--r-- | lib/log.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -142,10 +142,12 @@ extern int zlog_reset_file (struct zlog *zl); extern int zlog_rotate (struct zlog *); /* For hackey massage lookup and check */ -#define LOOKUP(x, y) mes_lookup(x, x ## _max, y) +#define LOOKUP(x, y) mes_lookup(x, x ## _max, y, "(no item found)") extern const char *lookup (struct message *, int); -extern const char *mes_lookup (struct message *meslist, int max, int index); +extern const char *mes_lookup (struct message *meslist, + int max, int index, + const char *no_item); extern const char *zlog_priority[]; extern const char *zlog_proto_names[]; |