From: dinesh <dinesh@dinesh-laptop>
Date: Sun, 3 Aug 2008 18:31:10 +0000 (+0530)
Subject: Deleting duplicate grab_file in tools/
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=e52dc42bad9a6637fbec44fe08705a51f6f84a94

Deleting duplicate grab_file in tools/
---

diff --git a/tools/_infotojson/infotojson.c b/tools/_infotojson/infotojson.c
index 86769bbc..460cb7fe 100644
--- a/tools/_infotojson/infotojson.c
+++ b/tools/_infotojson/infotojson.c
@@ -1,36 +1,6 @@
 /* This extract info from _info.c and create json file and also optionally store to db */
 #include "infotojson.h"
 
-/* This version adds one byte (for nul term) */
-static void *grab_file(void *ctx, const char *filename)
-{
-	unsigned int max = 16384, size = 0;
-	int ret, fd;
-	char *buffer;
-
-	if (streq(filename, "-"))
-		fd = dup(STDIN_FILENO);
-	else
-		fd = open(filename, O_RDONLY, 0);
-
-	if (fd < 0)
-		return NULL;
-
-	buffer = talloc_array(ctx, char, max+1);
-	while ((ret = read(fd, buffer + size, max - size)) > 0) {
-		size += ret;
-		if (size == max)
-			buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1);
-	}
-	if (ret < 0) {
-		talloc_free(buffer);
-		buffer = NULL;
-	} else
-		buffer[size] = '\0';
-	close(fd);
-	return buffer;
-}
-
 /*creating json structure for storing to file/db*/
 static struct json *createjson(char **infofile, char *author)
 {
@@ -56,10 +26,6 @@ static struct json *createjson(char **infofile, char *author)
 	 if (!jsonobj->module)
 		errx(1, "talloc error");
 		
-	//jsonobj->module = (char *)palloc(sizeof(char) * (modulename - 1));
-	//strncpy(jsonobj->module, infofile[0], modulename - 1);
-	//jsonobj->module[modulename - 1] = '\0';
-
 	jsonobj->title = infofile[0];
 	jsonobj->desc = &infofile[1];
 	
diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index aa3f2206..b70325ea 100644
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -11,35 +11,6 @@
 #include "talloc/talloc.h"
 #include "string/string.h"
 
-/* This version adds one byte (for nul term) */
-static void *grab_file(void *ctx, const char *filename)
-{
-	unsigned int max = 16384, size = 0;
-	int ret, fd;
-	char *buffer;
-
-	if (streq(filename, "-"))
-		fd = dup(STDIN_FILENO);
-	else
-		fd = open(filename, O_RDONLY, 0);
-
-	if (fd < 0)
-		return NULL;
-
-	buffer = talloc_array(ctx, char, max+1);
-	while ((ret = read(fd, buffer + size, max - size)) > 0) {
-		size += ret;
-		if (size == max)
-			buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1);
-	}
-	if (ret < 0) {
-		talloc_free(buffer);
-		buffer = NULL;
-	} else
-		buffer[size] = '\0';
-	close(fd);
-	return buffer;
-}
 
 int main(int argc, char *argv[])
 {
diff --git a/tools/tools.h b/tools/tools.h
index fff962c7..f07627eb 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -5,8 +5,5 @@
 
 char **get_deps(const void *ctx, const char *dir);
 
-void *grab_fd(const void *ctx, int fd);
-void *grab_file(const void *ctx, const char *filename);
-
 #endif /* CCAN_TOOLS_H */