Code cleanup

git-svn: trunk@3432

ChangeLog

@@ -1,3 +1,7 @@
+Tue Dec 18 13:52:40 GMT 2007 (njh)
+----------------------------------
+  * libclamav, sigtool:	Add consistency to function names in the VBA module
+
 Tue Dec 18 10:23:34 GMT 2007 (njh)
 ----------------------------------
   * libclamav/mbox.c:	Clean up print statement when redirection limit is

libclamav/scanners.c

@@ -819,7 +819,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)
 
 
     cli_dbgmsg("VBADir: %s\n", dirname);
-    if((vba_project = (vba_project_t *) vba56_dir_read(dirname))) {
+    if((vba_project = (vba_project_t *)cli_vba_readdir(dirname))) {
 
 	for(i = 0; i < vba_project->count; i++) {
 	    fullname = (char *) cli_malloc(strlen(vba_project->dir) + strlen(vba_project->name[i]) + 2);
@@ -837,7 +837,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)
 	    }
 	    free(fullname);
             cli_dbgmsg("VBADir: Decompress VBA project '%s'\n", vba_project->name[i]);
-	    data = (unsigned char *) vba_decompress(fd, vba_project->offset[i], &data_len);
+	    data = (unsigned char *)cli_vba_inflate(fd, vba_project->offset[i], &data_len);
 	    close(fd);
 
 	    if(!data) {
@@ -862,14 +862,14 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)
 	free(vba_project->dir);
 	free(vba_project->offset);
 	free(vba_project);
-    } else if ((fullname = ppt_vba_read(dirname))) {
+    } else if ((fullname = cli_ppt_vba_read(dirname))) {
     	if(cli_scandir(fullname, ctx) == CL_VIRUS) {
 	    ret = CL_VIRUS;
 	}
 	if(!cli_leavetemps_flag)
 	    cli_rmdirs(fullname);
     	free(fullname);
-    } else if ((vba_project = (vba_project_t *) wm_dir_read(dirname))) {
+    } else if ((vba_project = (vba_project_t *)cli_wm_readdir(dirname))) {
     	for (i = 0; i < vba_project->count; i++) {
 		fullname = (char *) cli_malloc(strlen(vba_project->dir) + strlen(vba_project->name[i]) + 2);
 		if(!fullname) {
@@ -886,7 +886,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)
 		}
 		free(fullname);
 		cli_dbgmsg("VBADir: Decompress WM project '%s' macro:%d key:%d length:%d\n", vba_project->name[i], i, vba_project->key[i], vba_project->length[i]);
-		data = (unsigned char *) wm_decrypt_macro(fd, vba_project->offset[i], vba_project->length[i], vba_project->key[i]);
+		data = (unsigned char *)cli_wm_decrypt_macro(fd, vba_project->offset[i], vba_project->length[i], vba_project->key[i]);
 		close(fd);
 		
 		if(!data) {

libclamav/vba_extract.c

@@ -262,8 +262,8 @@ vba_read_project_strings(int fd, int is_mac)
 	return TRUE;
 }
 
-/* Based on libgsf code */
-vba_project_t *vba56_dir_read(const char *dir)
+vba_project_t *
+cli_vba_readdir(const char *dir)
 {
 	unsigned char *buf;
 	const unsigned char vba56_signature[] = { 0xcc, 0x61 };
@@ -275,7 +275,7 @@ vba_project_t *vba56_dir_read(const char *dir)
 	struct vba56_header v56h;
 	char fullname[NAME_MAX + 1];
 
-	cli_dbgmsg("in vba56_dir_read()\n");
+	cli_dbgmsg("in cli_vba_readdir()\n");
 
 	if(dir == NULL)
 		return NULL;
@@ -479,7 +479,7 @@ vba_project_t *vba56_dir_read(const char *dir)
 }
 
 unsigned char *
-vba_decompress(int fd, off_t offset, int *size)
+cli_vba_inflate(int fd, off_t offset, int *size)
 {
 	unsigned int pos, shift, mask, distance, clean;
 	uint8_t flag;
@@ -797,7 +797,7 @@ ppt_stream_iter(int fd, const char *dir)
 }
 
 char *
-ppt_vba_read(const char *filename)
+cli_ppt_vba_read(const char *filename)
 {
 	char *dir;
 	const char *ret;
@@ -817,8 +817,10 @@ ppt_vba_read(const char *filename)
 
 	/* Create a directory to store the extracted OLE2 objects */
 	dir = cli_gentemp(NULL);
+	if(dir == NULL)
+		return NULL;
 	if(mkdir(dir, 0700)) {
-		cli_errmsg("ppt_vba_read: Can't create temporary directory %s\n", dir);
+		cli_errmsg("cli_ppt_vba_read: Can't create temporary directory %s\n", dir);
 		free(dir);
 		return NULL;
 	}
@@ -1081,7 +1083,7 @@ word_skip_macro_intnames(int fd)
 }
 
 vba_project_t *
-wm_dir_read(const char *dir)
+cli_wm_readdir(const char *dir)
 {
 	int fd, done;
 	off_t end_offset;
@@ -1211,7 +1213,7 @@ wm_dir_read(const char *dir)
 }
 
 unsigned char *
-wm_decrypt_macro(int fd, off_t offset, uint32_t len, unsigned char key)
+cli_wm_decrypt_macro(int fd, off_t offset, uint32_t len, unsigned char key)
 {
 	unsigned char *buff;
 

libclamav/vba_extract.h

@@ -35,14 +35,12 @@ typedef struct vba_project_tag {
 	char *dir;
 } vba_project_t;
 
-vba_project_t *vba56_dir_read(const char *dir);
-unsigned char *vba_decompress(int fd, off_t offset, int *size);
+vba_project_t	*cli_vba_readdir(const char *dir);
+unsigned char	*cli_vba_inflate(int fd, off_t offset, int *size);
 int cli_decode_ole_object(int fd, const char *dir);
-
-char *ppt_vba_read(const char *filename);
-
-vba_project_t *wm_dir_read(const char *dir);
-unsigned char *wm_decrypt_macro(int fd, off_t offset, uint32_t len,
+char	*cli_ppt_vba_read(const char *filename);
+vba_project_t	*cli_wm_readdir(const char *dir);
+unsigned char	*cli_wm_decrypt_macro(int fd, off_t offset, uint32_t len,
 					unsigned char key);
 
 #endif

sigtool/vba.c

@@ -1039,7 +1039,7 @@ int sigtool_vba_scandir (const char *dirname, int hex_output)
     unsigned char *data;
 
     cli_dbgmsg ("VBA scan dir: %s\n", dirname);
-    if ((vba_project = (vba_project_t *) vba56_dir_read (dirname))) {
+    if ((vba_project = (vba_project_t *)cli_vba_readdir(dirname))) {
 
 	for (i = 0; i < vba_project->count; i++) {
 	    fullname = (char *) malloc (strlen (vba_project->dir) + strlen (vba_project->name[i]) + 2);
@@ -1054,7 +1054,7 @@ int sigtool_vba_scandir (const char *dirname, int hex_output)
 	    free (fullname);
 	    cli_dbgmsg ("decompress VBA project '%s'\n", vba_project->name[i]);
 	    printf ("-------------- start of %s ------------------\n", vba_project->name[i]);
-	    data = (unsigned char *) vba_decompress (fd, vba_project->offset[i], &data_len);
+	    data = (unsigned char *)cli_vba_inflate(fd, vba_project->offset[i], &data_len);
 	    close (fd);
 
 	    if (!data) {
@@ -1075,13 +1075,13 @@ int sigtool_vba_scandir (const char *dirname, int hex_output)
 	free (vba_project->dir);
 	free (vba_project->offset);
 	free (vba_project);
-    } else if ((fullname = ppt_vba_read (dirname))) {
+    } else if ((fullname = cli_ppt_vba_read(dirname))) {
 	if (sigtool_scandir (fullname, hex_output) == CL_VIRUS) {
 	    ret = CL_VIRUS;
 	}
 	cli_rmdirs (fullname);
 	free (fullname);
-    } else if ((vba_project = (vba_project_t *) wm_dir_read (dirname))) {
+    } else if ((vba_project = (vba_project_t *)cli_wm_readdir(dirname))) {
 	for (i = 0; i < vba_project->count; i++) {
 	    fullname = (char *) malloc (strlen (vba_project->dir) + strlen (vba_project->name[i]) + 2);
 	    sprintf (fullname, "%s/%s", vba_project->dir, vba_project->name[i]);
@@ -1096,7 +1096,7 @@ int sigtool_vba_scandir (const char *dirname, int hex_output)
 	    cli_dbgmsg ("decompress WM project '%s' macro %d\n", vba_project->name[i], i);
 	    printf ("\n\n-------------- start of macro:%d key:%d length:%d ------------------\n", i,
 		    vba_project->key[i], vba_project->length[i]);
-	    data = (unsigned char *) wm_decrypt_macro (fd, vba_project->offset[i], vba_project->length[i],
+	    data = (unsigned char *)cli_wm_decrypt_macro(fd, vba_project->offset[i], vba_project->length[i],
 						    vba_project->key[i]);
 	    close (fd);