s/msg/path/

git-svn-id: file:///var/lib/svn/clamav-devel/branches/clamd-proto@4660 77e5149b-7576-45b1-b177-96237e5ba77b

ChangeLog

@@ -1,3 +1,7 @@
+Thu Jan 29 11:47:16 EET 2009 (edwin)
+------------------------------------
+ * libclamav/others.h, libclamav/others_common.c: s/msg/path/
+
 Thu Jan 29 11:39:58 EET 2009 (edwin)
 ------------------------------------
  * clamd/scanner.c, libclamav/others.h, libclamav/others_common.c: 

libclamav/others.h

@@ -377,7 +377,6 @@ int cli_matchregex(const char *str, const char *regex);
 enum cli_ftw_reason {
     visit_file,
     visit_directory_toplev, /* this is a directory at toplevel of recursion */
-    /* must not free its args in the below cases! */
     error_mem, /* recommended to return CL_EMEM */
     /* recommended to return CL_SUCCESS below */
     error_stat,
@@ -398,7 +397,7 @@ struct cli_ftw_cbdata {
  * after an error, we call the callback with reason == error,
  * and if it returns CL_BREAK we break.
  */
-typedef int (*cli_ftw_cb)(struct stat *stat_buf, char *filename, const char *msg, enum cli_ftw_reason reason, struct cli_ftw_cbdata *data);
+typedef int (*cli_ftw_cb)(struct stat *stat_buf, char *filename, const char *path, enum cli_ftw_reason reason, struct cli_ftw_cbdata *data);
 
 /*
  * returns 

libclamav/others_common.c

@@ -388,7 +388,7 @@ static int cli_ftw_dir(const char *dirname, int flags, int maxdepth, cli_ftw_cb
 static int handle_entry(struct dirent_data *entry, int flags, int maxdepth, cli_ftw_cb callback, struct cli_ftw_cbdata *data)
 {
     if (!entry->is_dir) {
-	return callback(entry->statbuf, entry->filename, NULL, visit_file, data);
+	return callback(entry->statbuf, entry->filename, entry->filename, visit_file, data);
     } else {
 	return cli_ftw_dir(entry->dirname, flags, maxdepth, callback, data);
     }