git.droids-corp.org
/
libcmdline.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmdline (merge-intel): reverse compilation flags for floats and socket
[libcmdline.git]
/
src
/
lib
/
cmdline_parse_num.c
diff --git
a/src/lib/cmdline_parse_num.c
b/src/lib/cmdline_parse_num.c
index
6c1ec72
..
1332efc
100644
(file)
--- a/
src/lib/cmdline_parse_num.c
+++ b/
src/lib/cmdline_parse_num.c
@@
-104,7
+104,7
@@
enum num_parse_state_t {
static const char * num_help[] = {
"UINT8", "UINT16", "UINT32",
"INT8", "INT16", "INT32",
static const char * num_help[] = {
"UINT8", "UINT16", "UINT32",
"INT8", "INT16", "INT32",
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
"FLOAT",
#endif
};
"FLOAT",
#endif
};
@@
-131,7
+131,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
const char * buf = srcbuf;
char c = *buf;
uint32_t res1 = 0;
const char * buf = srcbuf;
char c = *buf;
uint32_t res1 = 0;
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
uint32_t res2 = 0, res3 = 1;
#endif
uint32_t res2 = 0, res3 = 1;
#endif
@@
-147,7
+147,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
else if (c == '0') {
st = ZERO_OK;
}
else if (c == '0') {
st = ZERO_OK;
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
@@
-171,7
+171,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
else if (c == 'b') {
st = BIN;
}
else if (c == 'b') {
st = BIN;
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
@@
-195,7
+195,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
else
st = DEC_NEG_OK;
}
else
st = DEC_NEG_OK;
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if (c == '.') {
res1 = 0;
st = FLOAT_NEG;
else if (c == '.') {
res1 = 0;
st = FLOAT_NEG;
@@
-211,7
+211,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if (c == '.') {
st = FLOAT_NEG;
}
else if (c == '.') {
st = FLOAT_NEG;
}
@@
-226,7
+226,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if (c == '.') {
st = FLOAT_POS;
}
else if (c == '.') {
st = FLOAT_POS;
}
@@
-281,7
+281,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
}
break;
}
break;
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
case FLOAT_POS:
if (c >= '0' && c <= '9') {
if (add_to_res(c - '0', &res2, 10) < 0)
case FLOAT_POS:
if (c >= '0' && c <= '9') {
if (add_to_res(c - '0', &res2, 10) < 0)
@@
-338,11
+338,11
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
}
}
-#ifdef CMDLINE_NO_FLOAT
- debug_printf("(%"PRIu32")\n", res1);
-#else
+#ifdef CMDLINE_HAVE_FLOAT
debug_printf("(%"PRIu32") (%"PRIu32") (%"PRIu32")\n",
res1, res2, res3);
debug_printf("(%"PRIu32") (%"PRIu32") (%"PRIu32")\n",
res1, res2, res3);
+#else
+ debug_printf("(%"PRIu32")\n", res1);
#endif
buf ++;
#endif
buf ++;
@@
-389,7
+389,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
*(uint32_t *)res = (uint32_t) res1;
return (buf-srcbuf);
}
*(uint32_t *)res = (uint32_t) res1;
return (buf-srcbuf);
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if ( nd.type == FLOAT ) {
if (res)
*(float *)res = (float)res1;
else if ( nd.type == FLOAT ) {
if (res)
*(float *)res = (float)res1;
@@
-417,7
+417,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
*(int32_t *)res = (int32_t) (-res1);
return (buf-srcbuf);
}
*(int32_t *)res = (int32_t) (-res1);
return (buf-srcbuf);
}
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
else if ( nd.type == FLOAT ) {
if (res)
*(float *)res = - (float)res1;
else if ( nd.type == FLOAT ) {
if (res)
*(float *)res = - (float)res1;
@@
-429,7
+429,7
@@
cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
}
break;
}
break;
-#if
ndef CMDLINE_NO
_FLOAT
+#if
def CMDLINE_HAVE
_FLOAT
case FLOAT_POS:
case FLOAT_POS_OK:
if ( nd.type == FLOAT ) {
case FLOAT_POS:
case FLOAT_POS_OK:
if ( nd.type == FLOAT ) {