Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
static const char * num_help[] = {
"UINT8", "UINT16", "UINT32",
"INT8", "INT16", "INT32",
static const char * num_help[] = {
"UINT8", "UINT16", "UINT32",
"INT8", "INT16", "INT32",
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
const char * buf = srcbuf;
char c = *buf;
uint32_t res1 = 0;
const char * buf = srcbuf;
char c = *buf;
uint32_t res1 = 0;
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
uint32_t res2 = 0, res3 = 1;
#endif
uint32_t res2 = 0, res3 = 1;
#endif
else if (c == '0') {
st = ZERO_OK;
}
else if (c == '0') {
st = ZERO_OK;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else if (c == 'b') {
st = BIN;
}
else if (c == 'b') {
st = BIN;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
else if (c == '.') {
st = FLOAT_POS;
res1 = 0;
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
res1 = 0;
st = FLOAT_NEG;
else if (c == '.') {
res1 = 0;
st = FLOAT_NEG;
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_NEG;
}
else if (c == '.') {
st = FLOAT_NEG;
}
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
else if (c == '.') {
st = FLOAT_POS;
}
else if (c == '.') {
st = FLOAT_POS;
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef 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)
-#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);
*(uint32_t *)res = (uint32_t) res1;
return (buf-srcbuf);
}
*(uint32_t *)res = (uint32_t) res1;
return (buf-srcbuf);
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef 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;
*(int32_t *)res = (int32_t) (-res1);
return (buf-srcbuf);
}
*(int32_t *)res = (int32_t) (-res1);
return (buf-srcbuf);
}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef 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;
-#ifndef CMDLINE_NO_FLOAT
+#ifdef 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 ) {
#include <fcntl.h>
#include <termios.h>
#include <fcntl.h>
#include <termios.h>
-#ifndef CMDLINE_NO_SOCKET
+#ifdef CMDLINE_HAVE_SOCKET
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/socket.h>
-#ifndef CMDLINE_NO_SOCKET
+#ifdef CMDLINE_HAVE_SOCKET
int
cmdline_tcpv4_listen(in_addr_t addr, uint16_t port)
{
int
cmdline_tcpv4_listen(in_addr_t addr, uint16_t port)
{
#ifndef _CMDLINE_SOCKET_H_
#define _CMDLINE_SOCKET_H_
#ifndef _CMDLINE_SOCKET_H_
#define _CMDLINE_SOCKET_H_
-#ifndef CMDLINE_NO_SOCKET
+#ifdef CMDLINE_HAVE_SOCKET
int cmdline_tcpv4_listen(in_addr_t addr, uint16_t port);
int cmdline_tcpv6_listen(uint16_t port);
int cmdline_unix_listen(char *filename);
int cmdline_tcpv4_listen(in_addr_t addr, uint16_t port);
int cmdline_tcpv6_listen(uint16_t port);
int cmdline_unix_listen(char *filename);