Commit 6ab465c6 authored by Mike Frysinger's avatar Mike Frysinger

interface: localize & constify funcs

A bunch of these funcs are only used by interface.c, so drop them from
interface.h and mark them static.  Also mark a bunch of buffers as const
when they aren't written to.
parent 1fbf057e
...@@ -64,16 +64,12 @@ extern int if_fetch(struct interface *ife); ...@@ -64,16 +64,12 @@ extern int if_fetch(struct interface *ife);
extern int for_all_interfaces(int (*)(struct interface *, void *), void *); extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
extern int if_cache_free(void); extern int if_cache_free(void);
extern struct interface *lookup_interface(char *name); extern struct interface *lookup_interface(const char *name);
extern int if_readlist(void); extern int if_readlist(void);
extern int do_if_fetch(struct interface *ife); extern int do_if_fetch(struct interface *ife);
extern int do_if_print(struct interface *ife, void *cookie); extern int do_if_print(struct interface *ife, void *cookie);
extern int procnetdev_version(char *buf);
extern int get_dev_fields(char *bp, struct interface *ife);
extern char * get_name(char *name, char *p);
extern void ife_print(struct interface *ptr); extern void ife_print(struct interface *ptr);
extern int ife_short; extern int ife_short;
......
...@@ -92,9 +92,9 @@ int if_list_all = 0; /* do we have requested the complete proc list, yet? */ ...@@ -92,9 +92,9 @@ int if_list_all = 0; /* do we have requested the complete proc list, yet? */
static struct interface *int_list, *int_last; static struct interface *int_list, *int_last;
static int if_readlist_proc(char *); static int if_readlist_proc(const char *);
static struct interface *if_cache_add(char *name) static struct interface *if_cache_add(const char *name)
{ {
struct interface *ife, **nextp, *new; struct interface *ife, **nextp, *new;
...@@ -122,7 +122,7 @@ static struct interface *if_cache_add(char *name) ...@@ -122,7 +122,7 @@ static struct interface *if_cache_add(char *name)
return new; return new;
} }
struct interface *lookup_interface(char *name) struct interface *lookup_interface(const char *name)
{ {
/* if we have read all, use it */ /* if we have read all, use it */
if (if_list_all) if (if_list_all)
...@@ -210,7 +210,7 @@ out: ...@@ -210,7 +210,7 @@ out:
return err; return err;
} }
char *get_name(char *name, char *p) static const char *get_name(char *name, const char *p)
{ {
while (isspace(*p)) while (isspace(*p))
p++; p++;
...@@ -218,7 +218,7 @@ char *get_name(char *name, char *p) ...@@ -218,7 +218,7 @@ char *get_name(char *name, char *p)
if (isspace(*p)) if (isspace(*p))
break; break;
if (*p == ':') { /* could be an alias */ if (*p == ':') { /* could be an alias */
char *dot = p++; const char *dot = p++;
while (*p && isdigit(*p)) p++; while (*p && isdigit(*p)) p++;
if (*p == ':') { if (*p == ':') {
/* Yes it is, backup and copy it. */ /* Yes it is, backup and copy it. */
...@@ -240,7 +240,7 @@ char *get_name(char *name, char *p) ...@@ -240,7 +240,7 @@ char *get_name(char *name, char *p)
return p; return p;
} }
int procnetdev_version(char *buf) static int procnetdev_version(const char *buf)
{ {
if (strstr(buf, "compressed")) if (strstr(buf, "compressed"))
return 3; return 3;
...@@ -249,7 +249,7 @@ int procnetdev_version(char *buf) ...@@ -249,7 +249,7 @@ int procnetdev_version(char *buf)
return 1; return 1;
} }
int get_dev_fields(char *bp, struct interface *ife) static int get_dev_fields(const char *bp, struct interface *ife)
{ {
switch (procnetdev_vsn) { switch (procnetdev_vsn) {
case 3: case 3:
...@@ -313,7 +313,7 @@ int get_dev_fields(char *bp, struct interface *ife) ...@@ -313,7 +313,7 @@ int get_dev_fields(char *bp, struct interface *ife)
return 0; return 0;
} }
static int if_readlist_proc(char *target) static int if_readlist_proc(const char *target)
{ {
FILE *fh; FILE *fh;
char buf[512]; char buf[512];
...@@ -359,7 +359,8 @@ static int if_readlist_proc(char *target) ...@@ -359,7 +359,8 @@ static int if_readlist_proc(char *target)
err = 0; err = 0;
while (fgets(buf, sizeof buf, fh)) { while (fgets(buf, sizeof buf, fh)) {
char *s, name[IFNAMSIZ]; const char *s;
char name[IFNAMSIZ];
s = get_name(name, buf); s = get_name(name, buf);
ife = if_cache_add(name); ife = if_cache_add(name);
get_dev_fields(s, ife); get_dev_fields(s, ife);
...@@ -412,7 +413,7 @@ int if_fetch(struct interface *ife) ...@@ -412,7 +413,7 @@ int if_fetch(struct interface *ife)
{ {
struct ifreq ifr; struct ifreq ifr;
int fd; int fd;
char *ifname = ife->name; const char *ifname = ife->name;
safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0)
...@@ -564,7 +565,7 @@ int if_fetch(struct interface *ife) ...@@ -564,7 +565,7 @@ int if_fetch(struct interface *ife)
int do_if_fetch(struct interface *ife) int do_if_fetch(struct interface *ife)
{ {
if (if_fetch(ife) < 0) { if (if_fetch(ife) < 0) {
char *errmsg; const char *errmsg;
if (errno == ENODEV) { if (errno == ENODEV) {
/* Give better error message for this case. */ /* Give better error message for this case. */
errmsg = _("Device not found"); errmsg = _("Device not found");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment