From: Steinar H. Gunderson <steinar+git@gunderson.no>
Date: Thu, 4 Jan 2024 22:18:38 +0000 (+0100)
Subject: Remove some comments left over from mlocate.
X-Git-Tag: 1.1.21~8
X-Git-Url: https://git.sesse.net/?p=plocate;a=commitdiff_plain;h=c13691f9545120177b0d5ee33bda6af2816a092f

Remove some comments left over from mlocate.

We don't support gettext (although perhaps we should), so remove
some comments saying that we don't translate debug output.
---

diff --git a/bind-mount.cpp b/bind-mount.cpp
index 50cf7a5..b367e01 100644
--- a/bind-mount.cpp
+++ b/bind-mount.cpp
@@ -182,7 +182,6 @@ static int read_mount_entries(void)
 	mount me;
 	while (read_mount_entry(f, &me)) {
 		if (conf_debug_pruning) {
-			/* This is debugging output, don't mark anything for translation */
 			fprintf(stderr,
 			        " `%s' (%d on %d) is `%s' of `%s' (%u:%u), type `%s'\n",
 			        me.mount_point.c_str(), me.id, me.parent_id, me.root.c_str(), me.source.c_str(),
@@ -209,14 +208,12 @@ static size_t bind_mount_paths_index; /* = 0; */
 static void rebuild_bind_mount_paths(void)
 {
 	if (conf_debug_pruning) {
-		/* This is debugging output, don't mark anything for translation */
 		fprintf(stderr, "Rebuilding bind_mount_paths:\n");
 	}
 	if (read_mount_entries() != 0) {
 		return;
 	}
 	if (conf_debug_pruning) {
-		/* This is debugging output, don't mark anything for translation */
 		fprintf(stderr, "Matching bind_mount_paths:\n");
 	}
 
@@ -234,7 +231,6 @@ static void rebuild_bind_mount_paths(void)
 			// If there are two that are equal, prefer the one with lowest ID.
 			if (me.root.size() > other.root.size() && me.root.find(other.root) == 0) {
 				if (conf_debug_pruning) {
-					/* This is debugging output, don't mark anything for translation */
 					fprintf(stderr, " => adding `%s' (root `%s' is a child of `%s', mounted on `%s')\n",
 					        me.mount_point.c_str(), me.root.c_str(), other.root.c_str(), other.mount_point.c_str());
 				}
@@ -243,7 +239,6 @@ static void rebuild_bind_mount_paths(void)
 			}
 			if (me.root == other.root && me.id > other.id) {
 				if (conf_debug_pruning) {
-					/* This is debugging output, don't mark anything for translation */
 					fprintf(stderr, " => adding `%s' (duplicate of mount point `%s')\n",
 					        me.mount_point.c_str(), other.mount_point.c_str());
 				}
@@ -253,7 +248,6 @@ static void rebuild_bind_mount_paths(void)
 		}
 	}
 	if (conf_debug_pruning) {
-		/* This is debugging output, don't mark anything for translation */
 		fprintf(stderr, "...done\n");
 	}
 	string_list_dir_path_sort(&bind_mount_paths);
diff --git a/conf.cpp b/conf.cpp
index 60dd93f..64d2678 100644
--- a/conf.cpp
+++ b/conf.cpp
@@ -638,7 +638,6 @@ void conf_prepare(int argc, char *argv[])
 	string_list_dir_path_sort(&conf_prunepaths);
 
 	if (conf_debug_pruning) {
-		/* This is debuging output, don't mark anything for translation */
 		fprintf(stderr, "conf_block:\n");
 		for (char c : conf_block) {
 			if (isascii((unsigned char)c) && isprint((unsigned char)c) && c != '\\')
diff --git a/updatedb.cpp b/updatedb.cpp
index 3a39159..f4cfb02 100644
--- a/updatedb.cpp
+++ b/updatedb.cpp
@@ -162,7 +162,6 @@ struct entry {
 bool filesystem_is_excluded(const char *path)
 {
 	if (conf_debug_pruning) {
-		/* This is debugging output, don't mark anything for translation */
 		fprintf(stderr, "Checking whether filesystem `%s' is excluded:\n", path);
 	}
 	FILE *f = setmntent("/proc/mounts", "r");
@@ -173,7 +172,6 @@ bool filesystem_is_excluded(const char *path)
 	struct mntent *me;
 	while ((me = getmntent(f)) != nullptr) {
 		if (conf_debug_pruning) {
-			/* This is debugging output, don't mark anything for translation */
 			fprintf(stderr, " `%s', type `%s'\n", me->mnt_dir, me->mnt_type);
 		}
 		string type(me->mnt_type);
@@ -186,7 +184,6 @@ bool filesystem_is_excluded(const char *path)
 		           if the filesystem is unavailable hard-mounted NFS. */
 			char *dir = me->mnt_dir;
 			if (conf_debug_pruning) {
-				/* This is debugging output, don't mark anything for translation */
 				fprintf(stderr, " => type matches, dir `%s'\n", dir);
 			}
 			bool res = (strcmp(path, dir) == 0);
@@ -199,7 +196,6 @@ bool filesystem_is_excluded(const char *path)
 		}
 	}
 	if (conf_debug_pruning) {
-		/* This is debugging output, don't mark anything for translation */
 		fprintf(stderr, "...done\n");
 	}
 	endmntent(f);
@@ -535,7 +531,6 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
 {
 	if (conf_prune_bind_mounts && is_bind_mount(path.c_str())) {
 		if (conf_debug_pruning) {
-			/* This is debugging output, don't mark anything for translation */
 			fprintf(stderr, "Skipping `%s': bind mount\n", path.c_str());
 		}
 		close(fd);
@@ -684,14 +679,12 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
 
 		if (find(conf_prunenames.begin(), conf_prunenames.end(), e.name) != conf_prunenames.end()) {
 			if (conf_debug_pruning) {
-				/* This is debugging output, don't mark anything for translation */
 				fprintf(stderr, "Skipping `%s': in prunenames\n", e.name.c_str());
 			}
 			continue;
 		}
 		if (string_list_contains_dir_path(&conf_prunepaths, &conf_prunepaths_index, (path_plus_slash + e.name).c_str())) {
 			if (conf_debug_pruning) {
-				/* This is debugging output, don't mark anything for translation */
 				fprintf(stderr, "Skipping `%s/%s': in prunepaths\n", path.c_str(), e.name.c_str());
 			}
 			continue;