Changeset: 63d114fb0735 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63d114fb0735
Modified Files:
gdk/gdk_atoms.c
gdk/gdk_join.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (74 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -589,35 +589,34 @@ numFromStr(const char *src, int *len, vo
const lng maxdiv10 = LL_CONSTANT(922337203685477580); /*7*/
#endif
const int maxmod10 = 7; /* max value % 10 */
- int sign;
+ int sign = 1;
atommem(void, sz);
while (GDKisspace(*p))
p++;
- switch (*p) {
- case 'n':
- memcpy(*dst, ATOMnilptr(tp), sz);
- if (p[1] == 'i' && p[2] == 'l') {
- p += 3;
- return (int) (p - src);
+ if (!num10(*p)) {
+ switch (*p) {
+ case 'n':
+ memcpy(*dst, ATOMnilptr(tp), sz);
+ if (p[1] == 'i' && p[2] == 'l') {
+ p += 3;
+ return (int) (p - src);
+ }
+ /* not a number */
+ return 0;
+ case '-':
+ sign = -1;
+ p++;
+ break;
+ case '+':
+ p++;
+ break;
}
- /* not a number */
- return 0;
- case '-':
- sign = -1;
- p++;
- break;
- case '+':
- p++;
- /* fall through */
- default:
- sign = 1;
- break;
- }
- if (!num10(*p)) {
- /* not a number */
- memcpy(*dst, ATOMnilptr(tp), sz);
- return 0;
+ if (!num10(*p)) {
+ /* still not a number */
+ memcpy(*dst, ATOMnilptr(tp), sz);
+ return 0;
+ }
}
do {
if (base > maxdiv10 ||
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -327,7 +327,7 @@ binsearch(const oid *rcand, oid offset,
* If nil_on_miss is set, a nil value is returned in r2 if there is no
* match in r for a particular value in l (left outer join).
*
- * If semi is set, only a single set of values in t1/r2 is returned if
+ * If semi is set, only a single set of values in r1/r2 is returned if
* there is a match of l in r, no matter how many matches there are in
* r; otherwise all matches are returned.
*/
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
