diff options
| author | paul <paul> | 2005-05-06 21:37:42 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-05-06 21:37:42 +0000 |
| commit | 4dadc291e56195886fd047690ded9686f4e013fa (patch) | |
| tree | ea7c0690912d2b7d0c487f6855960e768fff1b6e /ospfd/ospf_vty.h | |
| parent | 69e10adaf28d4e116c38db2648786557fe131828 (diff) | |
2005-05-06 Paul Jakma <paul.jakma@sun.com>
* (general) extern and static qualifiers added.
unspecified arguments in definitions fixed, typically they should
be 'void'.
function casts added for callbacks.
Guards added to headers which lacked them.
Proper headers included rather than relying on incomplete
definitions.
gcc noreturn function attribute where appropriate.
* ospf_opaque.c: remove the private definition of ospf_lsa's
ospf_lsa_refresh_delay.
* ospf_lsa.h: export ospf_lsa_refresh_delay
* ospf_packet.c: (ospf_make_md5_digest) make *auth_key const,
correct thing to do - removes need for the casts later.
* ospf_vty.c: Use vty.h's VTY_GET_INTEGER rather than ospf_vty's
home-brewed versions, shuts up several warnings.
* ospf_vty.h: remove VTY_GET_UINT32. VTY_GET_IPV4_ADDRESS and
VTY_GET_IPV4_PREFIX moved to lib/vty.h.
* ospf_zebra.c: (ospf_distribute_list_update_timer) hacky
overloading of the THREAD_ARG pointer should at least use
uintptr_t.
Diffstat (limited to 'ospfd/ospf_vty.h')
| -rw-r--r-- | ospfd/ospf_vty.h | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h index 9f30e204..da0ed1cc 100644 --- a/ospfd/ospf_vty.h +++ b/ospfd/ospf_vty.h @@ -19,40 +19,10 @@ * 02111-1307, USA. */ -/* Macros. */ -#define VTY_GET_UINT32(NAME,V,STR) \ -{ \ - char *endptr = NULL; \ - (V) = strtoul ((STR), &endptr, 10); \ - if (*endptr != '\0' || ((V) == ULONG_MAX && errno == ERANGE)) \ - { \ - vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ - return CMD_WARNING; \ - } \ -} - -#define VTY_GET_IPV4_ADDRESS(NAME,V,STR) \ -{ \ - int retv; \ - retv = inet_aton ((STR), &(V)); \ - if (!retv) \ - { \ - vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ - return CMD_WARNING; \ - } \ -} - -#define VTY_GET_IPV4_PREFIX(NAME,V,STR) \ -{ \ - int retv; \ - retv = str2prefix_ipv4 ((STR), &(V)); \ - if (retv <= 0) \ - { \ - vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \ - return CMD_WARNING; \ - } \ -} +#ifndef _QUAGGA_OSPF_VTY_H +#define _QUAGGA_OSPF_VTY_H +/* Macros. */ #define VTY_GET_OSPF_AREA_ID(V,F,STR) \ { \ int retv; \ @@ -81,5 +51,7 @@ } /* Prototypes. */ -void ospf_vty_init (); -void ospf_vty_show_init (); +extern void ospf_vty_init (void); +extern void ospf_vty_show_init (void); + +#endif /* _QUAGGA_OSPF_VTY_H */ |