Merge pull request #2495 from pacovn/fixme_all_digit

bgpd, lib, ospfd, zebra: all_digit moved to frrstr
This commit is contained in:
Russ White 2018-06-20 07:38:19 -04:00 committed by GitHub
commit 96be948bcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 12 deletions

View File

@ -27,6 +27,7 @@
#include "memory.h"
#include "stream.h"
#include "filter.h"
#include "frrstr.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_rd.h"

View File

@ -37,6 +37,7 @@
#include "sockunion.h"
#include "hash.h"
#include "queue.h"
#include "frrstr.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_table.h"

View File

@ -34,6 +34,7 @@
#include "hash.h"
#include "queue.h"
#include "filter.h"
#include "frrstr.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_advertise.h"

View File

@ -161,3 +161,11 @@ bool begins_with(const char *str, const char *prefix)
return strncmp(str, prefix, lenprefix) == 0;
}
int all_digit(const char *str)
{
for (; *str != '\0'; str++)
if (!isdigit((int)*str))
return 0;
return 1;
}

View File

@ -97,4 +97,15 @@ void frrstr_strvec_free(vector v);
*/
bool begins_with(const char *str, const char *prefix);
/*
* Check the string only contains digit characters.
*
* str
* string to check for digits
*
* Returns:
* 1 str only contains digit characters, 0 otherwise
*/
int all_digit(const char *str);
#endif /* _FRRSTR_H_ */

View File

@ -1373,17 +1373,6 @@ void prefix_free(struct prefix *p)
XFREE(MTYPE_PREFIX, p);
}
/* Utility function. Check the string only contains digit
* character.
* FIXME str.[c|h] would be better place for this function. */
int all_digit(const char *str)
{
for (; *str != '\0'; str++)
if (!isdigit((int)*str))
return 0;
return 1;
}
/* Utility function to convert ipv4 prefixes to Classful prefixes */
void apply_classful_mask_ipv4(struct prefix_ipv4 *p)
{

View File

@ -458,7 +458,6 @@ static inline int ipv6_martian(struct in6_addr *addr)
return 0;
}
extern int all_digit(const char *);
extern int macstr2prefix_evpn(const char *str, struct prefix_evpn *p);
/* NOTE: This routine expects the address argument in network byte order. */

View File

@ -32,6 +32,7 @@
#include "log.h"
#include "plist.h"
#include "vrf.h"
#include "frrstr.h"
#include "ospfd/ospfd.h"
#include "ospfd/ospf_asbr.h"

View File

@ -31,6 +31,7 @@
#include "plist.h"
#include "nexthop.h"
#include "vrf.h"
#include "frrstr.h"
#include "zebra/zserv.h"
#include "zebra/redistribute.h"