MonetDB: Jul2017 - Fixed some unreachable code.

[Sjoerd Mullender]

Changeset: 0144621d7c65 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0144621d7c65
Modified Files:
        gdk/gdk_posix.c
        monetdb5/modules/atoms/json.c
        monetdb5/modules/mal/sysmon.c
Branch: Jul2017
Log Message:

Fixed some unreachable code.


diffs (79 lines):

diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -306,25 +306,22 @@ MT_getrss(void)
        size_t rss = 0;
 
        kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
-       if (kd == NULL)
-               return 0;
-
-       ki = kvm_getprocs(kd, KERN_PROC_PID, getpid(), &ski);
-       if (ki == NULL) {
-               kvm_close(kd);
-               return 0;
-       }
-
+       if (kd != NULL) {
+               ki = kvm_getprocs(kd, KERN_PROC_PID, getpid(), &ski);
+               if (ki != NULL) {
 #ifdef __NetBSD__              /* should we use configure for this? */
-       /* see bug 3217 */
-       rss = ki->kp_eproc.e_vm.vm_rssize;
+                       /* see bug 3217 */
+                       rss = ki->kp_eproc.e_vm.vm_rssize;
 #else
-       rss = ki->ki_rssize;
+                       rss = ki->ki_rssize;
 #endif
+                       kvm_close(kd);
 
-       kvm_close(kd);
-
-       return rss * MT_pagesize();
+                       return rss * MT_pagesize();
+               } else {
+                       kvm_close(kd);
+               }
+       }
 #elif defined(__linux__)
        /* get RSS on Linux */
        int fd;
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -946,7 +946,6 @@ JSONtoken(JSON *jt, char *j, char **next
                jt->error = createException(MAL, "json.parser", "Syntax error: 
value expected");
                return idx;
        }
-       return idx;
 }
 
 
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -151,7 +151,6 @@ SYSMONpause(Client cntxt, MalBlkPtr mb, 
                /* Does this happen?
                 * If so, what do we have TODO ? */
                throw(MAL, "SYSMONpause", "type hge not handled, yet");
-               break;
 #endif
        default:
                assert(0);
@@ -182,7 +181,6 @@ SYSMONresume(Client cntxt, MalBlkPtr mb,
                /* Does this happen?
                 * If so, what do we have TODO ? */
                throw(MAL, "SYSMONresume", "type hge not handled, yet");
-               break;
 #endif
        default:
                assert(0);
@@ -213,7 +211,6 @@ SYSMONstop(Client cntxt, MalBlkPtr mb, M
                /* Does this happen?
                 * If so, what do we have TODO ? */
                throw(MAL, "SYSMONstop", "type hge not handled, yet");
-               break;
 #endif
        default:
                assert(0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list