Changeset: c89a1d4ece9f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c89a1d4ece9f
Modified Files:
clients/mapiclient/mclient.c
gdk/gdk_system.c
monetdb5/modules/mal/tablet.c
sql/backends/monet5/UDF/capi/capi.c
sql/server/sql_mvc.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/mserver/mserver5.c
Branch: Aug2018
Log Message:
Merge with Mar2018 branch.
diffs (211 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1773,34 +1773,31 @@ start_pager(stream **saveFD)
/* ignore SIGPIPE so that we get an error instead of signal */
act.sa_handler = SIG_IGN;
- if(sigemptyset(&act.sa_mask) == -1) {
+ (void) sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ if(sigaction(SIGPIPE, &act, NULL) == -1) {
fprintf(stderr, "Starting '%s' failed\n", pager);
} else {
- act.sa_flags = 0;
- if(sigaction(SIGPIPE, &act, NULL) == -1) {
+ p = popen(pager, "w");
+ if (p == NULL)
fprintf(stderr, "Starting '%s' failed\n",
pager);
- } else {
- p = popen(pager, "w");
- if (p == NULL)
+ else {
+ *saveFD = toConsole;
+ /* put | in name to indicate that file should
be closed with pclose */
+ if ((toConsole = file_wastream(p, "|pager")) ==
NULL) {
+ toConsole = *saveFD;
+ *saveFD = NULL;
fprintf(stderr, "Starting '%s'
failed\n", pager);
- else {
- *saveFD = toConsole;
- /* put | in name to indicate that file
should be closed with pclose */
- if ((toConsole = file_wastream(p,
"|pager")) == NULL) {
+ }
+#ifdef HAVE_ICONV
+ if (encoding != NULL) {
+ if ((toConsole =
iconv_wstream(toConsole, encoding, "pager")) == NULL) {
toConsole = *saveFD;
*saveFD = NULL;
fprintf(stderr, "Starting '%s'
failed\n", pager);
}
-#ifdef HAVE_ICONV
- if (encoding != NULL) {
- if ((toConsole =
iconv_wstream(toConsole, encoding, "pager")) == NULL) {
- toConsole = *saveFD;
- *saveFD = NULL;
- fprintf(stderr,
"Starting '%s' failed\n", pager);
- }
- }
+ }
#endif
- }
}
}
}
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -559,8 +559,7 @@ MT_create_thread(MT_Id *t, void (*f) (vo
join_threads();
#ifdef HAVE_PTHREAD_SIGMASK
- if(sigfillset(&new_mask))
- return -1;
+ (void) sigfillset(&new_mask);
if(MT_thread_sigmask(&new_mask, &orig_mask))
return -1;
#endif
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -1298,13 +1298,7 @@ static str CUDFeval(Client cntxt, MalBlk
if (option_enable_mprotect) {
memset(&sa, 0, sizeof(sa));
sa.sa_flags = SA_SIGINFO;
- if(sigfillset(&sa.sa_mask) == -1) {
- msg = createException(MAL, "cudf.eval",
- "Failed to
set signal handler: %s",
-
strerror(errno));
- errno = 0;
- goto wrapup;
- }
+ (void) sigfillset(&sa.sa_mask);
sa.sa_sigaction = handler;
if (sigaction(SIGSEGV, &sa, &oldsa) == -1 ||
sigaction(SIGBUS, &sa, &oldsb) == -1) {
diff --git a/tools/merovingian/daemon/handlers.c
b/tools/merovingian/daemon/handlers.c
--- a/tools/merovingian/daemon/handlers.c
+++ b/tools/merovingian/daemon/handlers.c
@@ -235,7 +235,7 @@ segvhandler(int sig) {
(void)sig;
/* (try to) ignore any further segfaults */
- sigemptyset(&sa.sa_mask);
+ (void) sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
sa.sa_handler = SIG_IGN;
sigaction(SIGSEGV, &sa, NULL);
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -829,64 +829,42 @@ main(int argc, char *argv[])
MERO_EXIT(1);
}
- if(sigemptyset(&sa.sa_mask) == -1) {
+ (void) sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = handler;
+ if (sigaction(SIGINT, &sa, NULL) == -1 ||
+ sigaction(SIGQUIT, &sa, NULL) == -1 ||
+ sigaction(SIGTERM, &sa, NULL) == -1) {
Mfprintf(oerr, "%s: FATAL: unable to create signal handlers:
%s\n",
argv[0], strerror(errno));
MERO_EXIT(1);
- } else {
- sa.sa_flags = 0;
- sa.sa_handler = handler;
- if (
- sigaction(SIGINT, &sa, NULL) == -1 ||
- sigaction(SIGQUIT, &sa, NULL) == -1 ||
- sigaction(SIGTERM, &sa, NULL) == -1)
- {
- Mfprintf(oerr, "%s: FATAL: unable to create signal
handlers: %s\n",
- argv[0], strerror(errno));
- MERO_EXIT(1);
- }
}
- if(sigemptyset(&sa.sa_mask) == -1) {
+ (void) sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = huphandler;
+ if (sigaction(SIGHUP, &sa, NULL) == -1) {
Mfprintf(oerr, "%s: FATAL: unable to create signal handlers:
%s\n",
argv[0], strerror(errno));
MERO_EXIT(1);
- } else {
- sa.sa_flags = 0;
- sa.sa_handler = huphandler;
- if (sigaction(SIGHUP, &sa, NULL) == -1) {
- Mfprintf(oerr, "%s: FATAL: unable to create signal
handlers: %s\n",
- argv[0], strerror(errno));
- MERO_EXIT(1);
- }
}
- if(sigemptyset(&sa.sa_mask) == -1) {
+ (void) sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = segvhandler;
+ if (sigaction(SIGSEGV, &sa, NULL) == -1) {
Mfprintf(oerr, "%s: FATAL: unable to create signal handlers:
%s\n",
argv[0], strerror(errno));
MERO_EXIT(1);
- } else {
- sa.sa_flags = 0;
- sa.sa_handler = segvhandler;
- if (sigaction(SIGSEGV, &sa, NULL) == -1) {
- Mfprintf(oerr, "%s: FATAL: unable to create signal
handlers: %s\n",
- argv[0], strerror(errno));
- MERO_EXIT(1);
- }
}
- if(sigemptyset(&sa.sa_mask) == -1) {
+ (void) sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = SIG_IGN;
+ if (sigaction(SIGPIPE, &sa, NULL) == -1) {
Mfprintf(oerr, "%s: FATAL: unable to create signal handlers:
%s\n",
argv[0], strerror(errno));
MERO_EXIT(1);
- } else {
- sa.sa_flags = 0;
- sa.sa_handler = SIG_IGN;
- if (sigaction(SIGPIPE, &sa, NULL) == -1) {
- Mfprintf(oerr, "%s: FATAL: unable to create signal
handlers: %s\n",
- argv[0], strerror(errno));
- MERO_EXIT(1);
- }
}
/* make sure we will be able to write our pid */
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -566,18 +566,13 @@ main(int argc, char **av)
{
struct sigaction sa;
- if(sigemptyset(&sa.sa_mask) == -1) {
+ (void) sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = handler;
+ if (sigaction(SIGINT, &sa, NULL) == -1 ||
+ sigaction(SIGQUIT, &sa, NULL) == -1 ||
+ sigaction(SIGTERM, &sa, NULL) == -1) {
fprintf(stderr, "!unable to create signal handlers\n");
- } else {
- sa.sa_flags = 0;
- sa.sa_handler = handler;
- if (
- sigaction(SIGINT, &sa, NULL) == -1 ||
- sigaction(SIGQUIT, &sa, NULL) == -1 ||
- sigaction(SIGTERM, &sa, NULL) == -1)
- {
- fprintf(stderr, "!unable to create signal
handlers\n");
- }
}
}
#else
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
