convert two if else if chains to switches.
Index: base64.c
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/base64.c,v
retrieving revision 1.5
diff -u -p -r1.5 base64.c
--- base64.c 1 Sep 2016 13:49:32 -0000 1.5
+++ base64.c 13 Sep 2016 16:24:52 -0000
@@ -51,12 +51,17 @@ base64buf_url(const char *data, size_t l
b64_ntop(data, len, buf, sz);
for (i = 0; i < sz; i++)
- if ('+' == buf[i])
+ switch (buf[i]) {
+ case '+':
buf[i] = '-';
- else if ('/' == buf[i])
+ break;
+ case '/':
buf[i] = '_';
- else if ('=' == buf[i])
+ break;
+ case '=':
buf[i] = '\0';
+ break;
+ }
return (buf);
}
Index: json.c
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/json.c,v
retrieving revision 1.4
diff -u -p -r1.4 json.c
--- json.c 13 Sep 2016 16:04:51 -0000 1.4
+++ json.c 13 Sep 2016 16:24:52 -0000
@@ -152,15 +152,23 @@ jsmnparse_free(struct parse *p)
if (NULL == p)
return;
- for (i = 0; i < p->max; i++)
- if (JSMN_ARRAY == p->nodes[i].type)
- free(p->nodes[i].d.array);
- else if (JSMN_OBJECT == p->nodes[i].type)
- free(p->nodes[i].d.obj);
- else if (JSMN_PRIMITIVE == p->nodes[i].type)
- free(p->nodes[i].d.str);
- else if (JSMN_STRING == p->nodes[i].type)
- free(p->nodes[i].d.str);
+ for (i = 0; i < p->max; i++) {
+ struct jsmnn *n = &p->nodes[i];
+ switch (p->nodes[i].type) {
+ case JSMN_ARRAY:
+ free(n->d.array);
+ break;
+ case JSMN_OBJECT:
+ free(n->d.obj);
+ break;
+ case JSMN_PRIMITIVE:
+ free(n->d.str);
+ break;
+ case JSMN_STRING:
+ free(n->d.str);
+ break;
+ }
+ }
free(p->nodes);
free(p);
}