From 856c92de0cfccee39750fda1d04d410fdb06bbe2 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Tue, 12 Aug 2014 15:39:39 +0200
Subject: macros for ato* with cast
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
src/mds-server/mds-server.c | 2 +-
src/mds-server/receiving.c | 4 ++--
src/mds-server/sending.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'src/mds-server')
diff --git a/src/mds-server/mds-server.c b/src/mds-server/mds-server.c
index b217f2b..85e7c5c 100644
--- a/src/mds-server/mds-server.c
+++ b/src/mds-server/mds-server.c
@@ -104,7 +104,7 @@ int preinitialise_server(void)
eprintf("invalid value for %s: %s.", "--socket-fd", arg););
}
else if (startswith(arg, "--alarm=")) /* Schedule an alarm signal for forced abort. */
- alarm((unsigned)min(atoi(arg + strlen("--alarm=")), 60)); /* At most 1 minute. */
+ alarm((unsigned)min(atou(arg + strlen("--alarm=")), 60)); /* At most 1 minute. */
else
if (!strequals(arg, "--initial-spawn") && !strequals(arg, "--respawn"))
/* Not recognised, it is probably for another server. */
diff --git a/src/mds-server/receiving.c b/src/mds-server/receiving.c
index 127540b..15ebb4d 100644
--- a/src/mds-server/receiving.c
+++ b/src/mds-server/receiving.c
@@ -263,8 +263,8 @@ int message_received(client_t* client)
else if (strequals(h, "Modifying: yes")) modifying = 1;
else if (strequals(h, "Stop: yes")) stop = 1;
else if (startswith(h, "Message ID: ")) message_id = strstr(h, ": ") + 2;
- else if (startswith(h, "Priority: ")) priority = (int64_t)atoll(strstr(h, ": ") + 2);
- else if (startswith(h, "Modify ID: ")) modify_id = (uint64_t)atoll(strstr(h, ": ") + 2);
+ else if (startswith(h, "Priority: ")) priority = ato64(strstr(h, ": ") + 2);
+ else if (startswith(h, "Modify ID: ")) modify_id = atou64(strstr(h, ": ") + 2);
}
diff --git a/src/mds-server/sending.c b/src/mds-server/sending.c
index 3b78e54..bc78ef6 100644
--- a/src/mds-server/sending.c
+++ b/src/mds-server/sending.c
@@ -136,7 +136,7 @@ void multicast_message(multicast_t* multicast)
char* value = multicast->message + n;
char* lf = strchr(value, '\n');
*lf = '\0';
- modify_id = (uint64_t)atoll(value);
+ modify_id = atou64(value);
*lf = '\n';
}
--
cgit v1.2.3-70-g09d2