]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Use the same message to report an error while deleting a file
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Sun, 15 Jul 2012 12:38:08 +0000 (14:38 +0200)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Sun, 15 Jul 2012 12:38:08 +0000 (14:38 +0200)
No need to burden the translators with multiple messages identical but for
a few characters.

index.c
indexonly.c
lastlog.c
util.c

diff --git a/index.c b/index.c
index e676887a273ecb07ab49ba35fffbb9b9547884d5..d6af010a374a664e3cd4c5a927a5c82d1a178d65 100644 (file)
--- a/index.c
+++ b/index.c
@@ -44,7 +44,7 @@ void make_index(void)
                sprintf(wdir,"%sindex.html",outdir);
                if(access(wdir, R_OK) == 0) {
                        if (unlink(wdir)) {
-                               debuga(_("Cannot delete %s - %s\n"),wdir,strerror(errno));
+                               debuga(_("Cannot delete \"%s\": %s\n"),wdir,strerror(errno));
                                exit(EXIT_FAILURE);
                        }
                }
index a6f430a64449eb9412c688914bd76d880472cf06..c1c5684f8f0fbc1db2684bf42e0f7ab8f3c4294c 100644 (file)
@@ -47,7 +47,7 @@ void index_only(const char *dirname,int debug)
                        continue;
                }
                if (unlink(remove) == -1) {
-                       debuga(_("Failed to remove the file %s: %s\n"),remove,strerror(errno));
+                       debuga(_("Cannot delete \"%s\": %s\n"),remove,strerror(errno));
                }
        }
 
index d7352d886e98b02b5b1399847de97dda23ee122a..1db419093c1240c08f657b4e9c22f08ab8e73c17 100644 (file)
--- a/lastlog.c
+++ b/lastlog.c
@@ -84,7 +84,7 @@ void mklastlog(const char *outdir)
        }
 
        if (unlink(temp)) {
-               debuga(_("Cannot delete %s - %s\n"),temp,strerror(errno));
+               debuga(_("Cannot delete \"%s\": %s\n"),temp,strerror(errno));
                exit(EXIT_FAILURE);
        }
 
@@ -92,7 +92,7 @@ void mklastlog(const char *outdir)
                snprintf(temp,sizeof(temp),"%slastlog",outdir);
                if(access(temp, R_OK) == 0) {
                        if (unlink(temp)) {
-                               debuga(_("Cannot delete %s - %s\n"),temp,strerror(errno));
+                               debuga(_("Cannot delete \"%s\": %s\n"),temp,strerror(errno));
                                exit(EXIT_FAILURE);
                        }
                }
@@ -128,7 +128,7 @@ void mklastlog(const char *outdir)
        fclose(fp_in);
        snprintf(temp,sizeof(temp),"%slastlog",outdir);
        if (unlink(temp) == -1) {
-               debuga(_("Failed to delete the file %s\n"),temp);
+               debuga(_("Cannot delete \"%s\": %s\n"),temp,strerror(errno));
        }
 
        return;
diff --git a/util.c b/util.c
index 419c3e68529c2b367e5847c119ac9375d8e3eb45..0cdee158c462baa249a72a11fc0e7b0f62e4ccd4 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1832,7 +1832,7 @@ void unlinkdir(const char *dir,int contentonly)
                }
                if (S_ISREG(st.st_mode)) {
                        if (unlink(dname)) {
-                               debuga(_("cannot delete %s - %s\n"),dname,strerror(errno));
+                               debuga(_("Cannot delete \"%s\": %s\n"),dname,strerror(errno));
                                exit(EXIT_FAILURE);
                        }
                } else if (S_ISDIR(st.st_mode)) {
@@ -1845,7 +1845,7 @@ void unlinkdir(const char *dir,int contentonly)
 
        if (!contentonly) {
                if (rmdir(dir)) {
-                       debuga(_("cannot delete %s - %s\n"),dir,strerror(errno));
+                       debuga(_("Cannot delete \"%s\": %s\n"),dir,strerror(errno));
                        exit(EXIT_FAILURE);
                }
        }