diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
| commit | 42cd26ed298eee43b237d41e84718b045e147e90 (patch) | |
| tree | d02b89f1094853ddf9533b627630919889313fea /sbin/routed/table.c | |
| parent | 937e4ba86d9feec57e270077050fe1ec9a365c2b (diff) | |
| download | FreeBSD-src-42cd26ed298eee43b237d41e84718b045e147e90.zip FreeBSD-src-42cd26ed298eee43b237d41e84718b045e147e90.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'sbin/routed/table.c')
| -rw-r--r-- | sbin/routed/table.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 650d01f..acfc76f 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -639,16 +639,18 @@ rtm_type_name(u_char type) "RTM_NEWMADDR", "RTM_DELMADDR" }; - static char name0[NAME0_LEN]; +#define NEW_RTM_PAT "RTM type %#x" + static char name0[sizeof(NEW_RTM_PAT)+2]; if (type > sizeof(rtm_types)/sizeof(rtm_types[0]) || type == 0) { - snprintf(name0, NAME0_LEN, "RTM type %#x", type); + snprintf(name0, sizeof(name0), NEW_RTM_PAT, type); return name0; } else { return rtm_types[type-1]; } +#undef NEW_RTM_PAT } |
