diff mbox

[1/2] batctl: Remove dead code from old sysfs parsing

Message ID 1277114808-16584-1-git-send-email-sven.eckelmann@gmx.de (mailing list archive)
State Accepted, archived
Commit ffef8499cc83b8a21d8931cd2e960e948fd65a48
Headers

Commit Message

Sven Eckelmann June 21, 2010, 10:06 a.m. UTC 
  The old batman-adv sysfs files provided all their available options
inside their output. This made it necessary to parse the output to
analyse it before we accept an input given to batctl.

This functionality was removed as it wasn't the correct style according
to the sysfs maintainer. Not all code related to that were removed right
away when batctl was adopted to the new sysfs handling.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
 functions.c |   18 ------------------
 functions.h |    1 -
 2 files changed, 0 insertions(+), 19 deletions(-)

Comments

Marek Lindner June 21, 2010, 1:22 p.m. UTC | #1 
On Monday 21 June 2010 12:06:47 Sven Eckelmann wrote:
> The old batman-adv sysfs files provided all their available options
> inside their output. This made it necessary to parse the output to
> analyse it before we accept an input given to batctl.
> 
> This functionality was removed as it wasn't the correct style according
> to the sysfs maintainer. Not all code related to that were removed right
> away when batctl was adopted to the new sysfs handling.

I applied both patches (revision 1716 & 1717).

Thanks,
Marek
diff mbox

Patch

diff --git a/functions.c b/functions.c
index 3bcb0b2..7be9511 100644
--- a/functions.c
+++ b/functions.c
@@ -303,21 +303,3 @@  out:
 		close(fd);
 	return res;
 }
-
-char *strchr_anyof(const char *s, const char *n)
-{
-	char *cur, *first = NULL;
-	size_t i, len;
-
-	if (s == NULL || n == NULL)
-		return first;
-
-	len = strlen(n);
-	for (i = 0; i < len; i++) {
-		cur = strchr(s, n[i]);
-		if (cur != NULL && (cur < first || first == NULL))
-			first = cur;
-	}
-
-	return first;
-}
diff --git a/functions.h b/functions.h
index 847a482..885df34 100644
--- a/functions.h
+++ b/functions.h
@@ -35,7 +35,6 @@  char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt);
 char *get_name_by_macstr(char *mac_str, int read_opt);
 int read_file(char *dir, char *path, int read_opt);
 int write_file(char *dir, char *fname, char *arg1, char *arg2);
-char *strchr_anyof(const char *s, const char *n);
 
 extern char *line_ptr;