[lxc-devel] [PATCH 3/3] Remove unused parsing code

Clement Calmels clement.calmels at fr.ibm.com
Thu Sep 16 14:05:54 UTC 2010


Signed-off-by: Clement Calmels <clement.calmels at fr.ibm.com>
---

 src/lxc/parse.c |   72 -------------------------------------------------------
 src/lxc/parse.h |   12 ---------
 2 files changed, 0 insertions(+), 84 deletions(-)

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index ee6b5de..156f05a 100644
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -33,39 +33,6 @@
 
 lxc_log_define(lxc_parse, lxc);
 
-static int dir_filter(const struct dirent *dirent)
-{
-	if (!strcmp(dirent->d_name, ".") ||
-            !strcmp(dirent->d_name, ".."))
-                return 0;
-        return 1;
-}
-
-int lxc_dir_for_each(const char *name, const char *directory,
-		     lxc_dir_cb callback, void *data)
-{
-	struct dirent **namelist;
-	int n, ret = 0;
-
-	n = scandir(directory, &namelist, dir_filter, alphasort);
-	if (n < 0) {
-		SYSERROR("failed to scan %s directory", directory);
-		return -1;
-	}
-
-	while (n--) {
-		if (!ret &&
-		    callback(name, directory, namelist[n]->d_name, data)) {
-			ERROR("callback failed");
-			ret = -1;
-		}
-		free(namelist[n]);
-	}
-	free(namelist);
-
-	return ret;
-}
-
 int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data)
 {
 	FILE *f;
@@ -92,42 +59,3 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data)
 	fclose(f);
 	return err;
 }
-
-int lxc_char_left_gc(char *buffer, size_t len)
-{
-	int i;
-	for (i = 0; i < len; i++) {
-		if (buffer[i] == ' ' ||
-		    buffer[i] == '\t')
-			continue;
-		return i;
-	}
-	return 0;
-}
-
-int lxc_char_right_gc(char *buffer, size_t len)
-{
-	int i;
-	for (i = len - 1; i >= 0; i--) {
-		if (buffer[i] == ' '  ||
-		    buffer[i] == '\t' ||
-		    buffer[i] == '\n' ||
-		    buffer[i] == '\0')
-			continue;
-		return i + 1;
-	}
-	return 0;
-}
-
-int lxc_is_line_empty(char *line)
-{
-	int i;
-	size_t len = strlen(line);
-
-	for (i = 0; i < len; i++)
-		if (line[i] != ' ' && line[i] != '\t' &&
-		    line[i] != '\n' && line[i] != '\r' &&
-		    line[i] != '\f' && line[i] != '\0')
-			return 0;
-	return 1;
-}
diff --git a/src/lxc/parse.h b/src/lxc/parse.h
index 76d416b..dfdd1fc 100644
--- a/src/lxc/parse.h
+++ b/src/lxc/parse.h
@@ -23,21 +23,9 @@
 #ifndef __parse_h
 #define __parse_h
 
-typedef int (*lxc_dir_cb)(const char *name, const char *directory,
-			  const char *file, void *data);
-
 typedef int (*lxc_file_cb)(char *buffer, void *data);
 
-extern int lxc_dir_for_each(const char *name, const char *directory,
-			    lxc_dir_cb callback, void *data);
-
 extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback,
 				  void* data);
 
-extern int lxc_char_left_gc(char *buffer, size_t len);
-
-extern int lxc_char_right_gc(char *buffer, size_t len);
-
-extern int lxc_is_line_empty(char *line);
-
 #endif





More information about the lxc-devel mailing list