Changeset: ccf5de31a115 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ccf5de31a115
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_storage.c
Branch: Jun2023
Log Message:
Don't end GDKsyserror messages with period.
The message is followed by a colon, and that looks silly.
diffs (60 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2073,7 +2073,7 @@ BBPdir_first(bool subcommit, lng logno,
* replacing the entries for the subcommitted bats */
if ((obbpf = GDKfileopen(0, SUBDIR, "BBP", "dir", "r")) == NULL
&&
(obbpf = GDKfileopen(0, BAKDIR, "BBP", "dir", "r")) ==
NULL) {
- GDKsyserror("subcommit attempted without backup
BBP.dir.");
+ GDKsyserror("subcommit attempted without backup
BBP.dir");
goto bailout;
}
/* read first three lines */
@@ -2139,7 +2139,7 @@ BBPdir_step(bat bid, BUN size, int n, ch
}
n = -1;
if (fclose(*obbpfp) == EOF) {
- GDKsyserror("Closing backup BBP.dir file
failed.\n");
+ GDKsyserror("Closing backup BBP.dir file
failed\n");
GDKclrerr(); /* ignore error */
}
*obbpfp = NULL;
@@ -2177,7 +2177,7 @@ BBPdir_last(int n, char *buf, size_t buf
goto bailout;
}
if (fclose(obbpf) == EOF) {
- GDKsyserror("Closing backup BBP.dir file
failed.\n");
+ GDKsyserror("Closing backup BBP.dir file
failed\n");
GDKclrerr(); /* ignore error */
}
obbpf = NULL;
@@ -3902,7 +3902,7 @@ BBPsync(int cnt, bat *restrict subcommit
MT_rename(bakdir, deldir) < 0))
ret = GDK_FAIL;
if (ret != GDK_SUCCEED)
- GDKsyserror("rename(%s,%s) failed.\n", bakdir, deldir);
+ GDKsyserror("rename(%s,%s) failed\n", bakdir, deldir);
TRC_DEBUG(IO_, "rename %s %s = %d\n", bakdir, deldir, (int)
ret);
}
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -184,7 +184,7 @@ GDKremovedir(int farmid, const char *dir
closedir(dirp);
ret = MT_rmdir(dirnamestr);
if (ret != 0)
- GDKsyserror("rmdir(%s) failed.\n", dirnamestr);
+ GDKsyserror("rmdir(%s) failed\n", dirnamestr);
TRC_DEBUG(IO_, "rmdir %s = %d\n", dirnamestr, ret);
GDKfree(dirnamestr);
return ret ? GDK_FAIL : GDK_SUCCEED;
@@ -550,7 +550,7 @@ GDKload(int farmid, const char *nme, con
for (n_expected = (ssize_t) size; n_expected >
0; n_expected -= n) {
n = read(fd, dst, (unsigned) MIN(1 <<
30, n_expected));
if (n < 0)
- GDKsyserror("GDKload: cannot
read: name=%s, ext=%s, %zu bytes missing.\n", nme, ext ? ext : "", (size_t)
n_expected);
+ GDKsyserror("GDKload: cannot
read: name=%s, ext=%s, %zu bytes missing\n", nme, ext ? ext : "", (size_t)
n_expected);
#ifndef __COVERITY__
/* Coverity doesn't seem to
* recognize that we're just
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
