Merge 92ba6b439e6aed8557a315ebfcd350016159be52 into 58e26c3e9dba6bc05b596cbc480c66448213ba70

nfq/desync.c

@@ -354,7 +354,7 @@ static void auto_hostlist_failed(struct desync_profile *dp, const char *hostname
 			}
 			if (!append_to_list_file(dp->hostlist_auto->filename, hostname))
 			{
-				DLOG_PERROR("write to auto hostlist");
+				DLOG_PERROR("write to auto hostlist:");
 				return;
 			}
 			if (!file_mod_signature(dp->hostlist_auto->filename, &dp->hostlist_auto->mod_sig))

nfq/hostlist.c

@@ -109,7 +109,6 @@ static bool LoadHostList(struct hostlist_file *hfile)
 		if (!file_mod_signature(hfile->filename, &fsig))
 		{
 			// stat() error
-			DLOG_PERROR("file_mod_signature");
 			DLOG_ERR("cannot access hostlist file '%s'. in-memory content remains unchanged.\n",hfile->filename);
 			return true;
 		}

nfq/ipset.c

@@ -130,7 +130,6 @@ static bool LoadIpset(struct ipset_file *hfile)
 		if (!file_mod_signature(hfile->filename, &fsig))
 		{
 			// stat() error
-			DLOG_PERROR("file_mod_signature");
 			DLOG_ERR("cannot access ipset file '%s'. in-memory content remains unchanged.\n",hfile->filename);
 			return true;
 		}

tpws/hostlist.c

@@ -109,7 +109,6 @@ static bool LoadHostList(struct hostlist_file *hfile)
 		if (!file_mod_signature(hfile->filename, &fsig))
 		{
 			// stat() error
-			DLOG_PERROR("file_mod_signature");
 			DLOG_ERR("cannot access hostlist file '%s'. in-memory content remains unchanged.\n",hfile->filename);
 			return true;
 		}

tpws/ipset.c

@@ -130,7 +130,6 @@ static bool LoadIpset(struct ipset_file *hfile)
 		if (!file_mod_signature(hfile->filename, &fsig))
 		{
 			// stat() error
-			DLOG_PERROR("file_mod_signature");
 			DLOG_ERR("cannot access ipset file '%s'. in-memory content remains unchanged.\n",hfile->filename);
 			return true;
 		}