From 124362caa5c7b124aec316869748f5dd64794c17 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 17 Jun 2024 21:46:17 +0200 Subject: [PATCH] parser: move atoi_n to import-divinglog.cpp That was the only user of this helper function, so move it there. Moreover, impelement it with the standard function std::from_chars instead of copying the string. Signed-off-by: Berthold Stoeger --- core/import-divinglog.cpp | 9 +++++++++ core/parse.cpp | 12 ------------ core/parse.h | 1 - 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/core/import-divinglog.cpp b/core/import-divinglog.cpp index 6e356972f..32df725fc 100644 --- a/core/import-divinglog.cpp +++ b/core/import-divinglog.cpp @@ -16,6 +16,15 @@ #include "membuffer.h" #include "gettext.h" +#include + +static int atoi_n(const char *ptr, size_t len) +{ + int res = 0; + std::from_chars(ptr, ptr + len, res); + return res; +} + static int divinglog_cylinder(void *param, int, char **data, char **) { struct parser_state *state = (struct parser_state *)param; diff --git a/core/parse.cpp b/core/parse.cpp index a217b4b9d..aec9f37c2 100644 --- a/core/parse.cpp +++ b/core/parse.cpp @@ -466,15 +466,3 @@ void add_dive_site(const char *ds_name, struct dive *dive, struct parser_state * } } } - -int atoi_n(char *ptr, unsigned int len) -{ - if (len < 10) { - char buf[10]; - - memcpy(buf, ptr, len); - buf[len] = 0; - return atoi(buf); - } - return 0; -} diff --git a/core/parse.h b/core/parse.h index 1412b0714..4420088b1 100644 --- a/core/parse.h +++ b/core/parse.h @@ -139,7 +139,6 @@ void add_dive_site(const char *ds_name, struct dive *dive, struct parser_state * int trimspace(char *buffer); void start_match(const char *type, const char *name, char *buffer); void nonmatch(const char *type, const char *name, char *buffer); -int atoi_n(char *ptr, unsigned int len); void parse_xml_init(); int parse_xml_buffer(const char *url, const char *buf, int size, struct divelog *log, const struct xml_params *params);