MonetDB: Jul2012 - Eliminate dead code found by Coverity.

[Sjoerd Mullender]

Changeset: e11bb06d917e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e11bb06d917e
Modified Files:
        monetdb5/modules/atoms/str.mx
Branch: Jul2012
Log Message:

Eliminate dead code found by Coverity.


diffs (22 lines):

diff --git a/monetdb5/modules/atoms/str.mx b/monetdb5/modules/atoms/str.mx
--- a/monetdb5/modules/atoms/str.mx
+++ b/monetdb5/modules/atoms/str.mx
@@ -1674,16 +1674,13 @@ strSubString(str *res, str s, int *offse
                        off = 0;
                }
        }
+       /* here, off >= 0 */
        if (l < 0) {
                *res = GDKstrdup("");
                return GDK_SUCCEED;
        }
-       s = UTF8_strtail(s, MAX(0, off));
+       s = UTF8_strtail(s, off);
        len = (int)(UTF8_strtail(s, l) - s);
-       if (off < 0) {
-               len += off;
-               off = 0;
-       }
        *res = (char *) GDKmalloc(len + 1);
        strncpy(*res, s, len);
        (*res)[len] = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list