Changeset: 7af98f5bcdef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7af98f5bcdef
Modified Files:
monetdb5/modules/atoms/inet.c
Branch: Jan2014
Log Message:
A bit of cleanup.
diffs (136 lines):
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -75,13 +75,13 @@ INETfromString(str src, int *len, inet *
/* this is for the cat his violin
throw(PARSE, "inet.fromStr", "Error while
parsing, unexpected string '%s'", endptr);
*/
- goto error; /* yeah, I know, but I'm just
simulating try-catch stuff in C now */
+ goto error;
}
if (parse > 255 || parse < 0) {
/* this is for the cat his violin
throw(PARSE, "inet.fromStr", "Illegal quad
value: %d", parse);
*/
- goto error; /* yeah, I know, but I'm just
simulating try-catch stuff in C now */
+ goto error;
}
switch (type) {
case 0:
@@ -127,14 +127,14 @@ INETfromString(str src, int *len, inet *
/* this is for the cat his violin
throw(PARSE, "inet.fromStr", "Error while parsing, unexpected
string '%s'", endptr);
*/
- goto error; /* yeah, I know, but I'm just simulating
try-catch stuff in C now */
+ goto error;
}
if (type == 3) {
if (parse > 255 || parse < 0) {
/* this is for the cat his violin
throw(PARSE, "inet.fromStr", "Illegal quad value: %d",
parse);
*/
- goto error; /* yeah, I know, but I'm just
simulating try-catch stuff in C now */
+ goto error;
}
(*retval)->q4 = (unsigned char) parse;
/* default to an exact match (all bits) */
@@ -144,14 +144,14 @@ INETfromString(str src, int *len, inet *
/* this is for the cat his violin
throw(PARSE, "inet.fromStr", "Illegal mask value: %d",
parse);
*/
- goto error; /* yeah, I know, but I'm just
simulating try-catch stuff in C now */
+ goto error;
}
(*retval)->mask = (unsigned char) parse;
} else {
/* this is for the cat his violin
throw(PARSE, "inet.fromStr", "Error while parsing,
unexpected string '%s'", endptr);
*/
- goto error; /* yeah, I know, but I'm just simulating
try-catch stuff in C now */
+ goto error;
}
return(i);
@@ -178,9 +178,12 @@ INETtoString(str *retval, int *len, inet
if (in_isnil(value)) {
*len = snprintf(*retval, *len, "(nil)");
} else if (value->mask == 32) {
- *len = snprintf(*retval, *len, "%d.%d.%d.%d", value->q1,
value->q2, value->q3, value->q4);
+ *len = snprintf(*retval, *len, "%d.%d.%d.%d",
+ value->q1, value->q2,
value->q3, value->q4);
} else {
- *len = snprintf(*retval, *len, "%d.%d.%d.%d/%d", value->q1,
value->q2, value->q3, value->q4, value->mask);
+ *len = snprintf(*retval, *len, "%d.%d.%d.%d/%d",
+ value->q1, value->q2,
value->q3, value->q4,
+ value->mask);
}
return(*len);
@@ -222,7 +225,9 @@ INET_comp_EQ(bit *retval, inet * val1, i
{
if (in_isnil(val1) || in_isnil(val2)) {
*retval = bit_nil;
- } else if (val1->q1 == val2->q1 && val1->q2 == val2->q2 && val1->q3 ==
val2->q3 && val1->q4 == val2->q4 && val1->mask == val2->mask) {
+ } else if (val1->q1 == val2->q1 && val1->q2 == val2->q2 &&
+ val1->q3 == val2->q3 && val1->q4 == val2->q4 &&
+ val1->mask == val2->mask) {
*retval = 1;
} else {
*retval = 0;
@@ -238,7 +243,9 @@ INET_comp_NEQ(bit *retval, inet * val1,
{
if (in_isnil(val1) || in_isnil(val2)) {
*retval = bit_nil;
- } else if (val1->q1 == val2->q1 && val1->q2 == val2->q2 && val1->q3 ==
val2->q3 && val1->q4 == val2->q4 && val1->mask == val2->mask) {
+ } else if (val1->q1 == val2->q1 && val1->q2 == val2->q2 &&
+ val1->q3 == val2->q3 && val1->q4 == val2->q4 &&
+ val1->mask == val2->mask) {
*retval = 0;
} else {
*retval = 1;
@@ -354,7 +361,10 @@ INET_comp_CW(bit *retval, inet * val1, i
val2->q4);
*/
- if ((val1->q1 & m[0]) == (val2->q1 & m[0]) && (val1->q2 & m[1])
== (val2->q2 & m[1]) && (val1->q3 & m[2]) == (val2->q3 & m[2]) && (val1->q4 &
m[3]) == (val2->q4 & m[3])) {
+ if ((val1->q1 & m[0]) == (val2->q1 & m[0]) &&
+ (val1->q2 & m[1]) == (val2->q2 & m[1]) &&
+ (val1->q3 & m[2]) == (val2->q3 & m[2]) &&
+ (val1->q4 & m[3]) == (val2->q4 & m[3])) {
*retval = 1;
} else {
*retval = 0;
@@ -615,7 +625,8 @@ INETtext(str *retval, inet * val)
} else {
ip = GDKmalloc(sizeof(char) * 19);
- sprintf(ip, "%d.%d.%d.%d/%d", val->q1, val->q2, val->q3,
val->q4, val->mask);
+ snprintf(ip, sizeof(char) * 19, "%d.%d.%d.%d/%d",
+ val->q1, val->q2, val->q3, val->q4, val->mask);
*retval = ip;
}
@@ -668,15 +679,18 @@ INETabbrev(str *retval, inet * val)
ip = GDKmalloc(sizeof(char) * 19);
if (mask > 24) {
- sprintf(ip, "%d.%d.%d.%d/%d", val->q1, val->q2,
val->q3, val->q4, val->mask);
+ snprintf(ip, sizeof(char) * 19, "%d.%d.%d.%d/%d",
+ val->q1, val->q2, val->q3, val->q4,
val->mask);
} else if (mask > 16) {
- sprintf(ip, "%d.%d.%d/%d", val->q1, val->q2, val->q3,
val->mask);
+ snprintf(ip, sizeof(char) * 19, "%d.%d.%d/%d",
+ val->q1, val->q2, val->q3, val->mask);
} else if (mask > 8) {
- sprintf(ip, "%d.%d/%d", val->q1, val->q2, val->mask);
+ snprintf(ip, sizeof(char) * 19, "%d.%d/%d",
+ val->q1, val->q2, val->mask);
} else if (mask > 0) {
- sprintf(ip, "%d/%d", val->q1, val->mask);
+ snprintf(ip, sizeof(char) * 19, "%d/%d", val->q1,
val->mask);
} else {
- sprintf(ip, "/0");
+ snprintf(ip, sizeof(char) * 19, "/0");
}
*retval = ip;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
