From 1d2d1ee73ed2100e5587f5070f97245fcc03cbee Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Wed, 23 May 2018 10:07:49 -0700 Subject: [PATCH] Use proj_strtod.h for proj_strtod and proj_atof --- src/Makefile.am | 4 ++-- src/bin_cct.cmake | 6 +++--- src/bin_gie.cmake | 6 +++--- src/cct.c | 4 +--- src/gie.c | 5 +---- src/proj_strtod.c | 6 +----- src/proj_strtod.h | 4 ++++ 7 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 src/proj_strtod.h diff --git a/src/Makefile.am b/src/Makefile.am index 971ac78c45..2fd8aa5c85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,11 +18,11 @@ EXTRA_DIST = makefile.vc proj.def bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \ proj_SOURCES = proj.c gen_cheb.c p_series.c cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c -cct_SOURCES = cct.c proj_strtod.c optargpm.h +cct_SOURCES = cct.c proj_strtod.c proj_strtod.h optargpm.h nad2bin_SOURCES = nad2bin.c geod_SOURCES = geod.c geod_set.c geod_interface.c geod_interface.h -gie_SOURCES = gie.c proj_strtod.c optargpm.h +gie_SOURCES = gie.c proj_strtod.c proj_strtod.h optargpm.h multistresstest_SOURCES = multistresstest.c test228_SOURCES = test228.c geodtest_SOURCES = geodtest.c diff --git a/src/bin_cct.cmake b/src/bin_cct.cmake index a204e7e7ca..caa261a870 100644 --- a/src/bin_cct.cmake +++ b/src/bin_cct.cmake @@ -1,9 +1,9 @@ -set(CCT_SRC cct.c proj_strtod.c) +set(CCT_SRC cct.c proj_strtod.c proj_strtod.h) set(CCT_INCLUDE optargpm.h) source_group("Source Files\\Bin" FILES ${CCT_SRC}) add_executable(cct ${CCT_SRC} ${CCT_INCLUDE}) target_link_libraries(cct ${PROJ_LIBRARIES}) -install(TARGETS cct - RUNTIME DESTINATION ${BINDIR}) +install(TARGETS cct + RUNTIME DESTINATION ${BINDIR}) diff --git a/src/bin_gie.cmake b/src/bin_gie.cmake index ca6dde0ea2..b5f8f8efc8 100644 --- a/src/bin_gie.cmake +++ b/src/bin_gie.cmake @@ -1,9 +1,9 @@ -set(GIE_SRC gie.c proj_strtod.c) +set(GIE_SRC gie.c proj_strtod.c proj_strtod.h) set(GIE_INCLUDE optargpm.h) source_group("Source Files\\Bin" FILES ${GIE_SRC}) add_executable(gie ${GIE_SRC} ${GIE_INCLUDE}) target_link_libraries(gie ${PROJ_LIBRARIES}) -install(TARGETS gie - RUNTIME DESTINATION ${BINDIR}) +install(TARGETS gie + RUNTIME DESTINATION ${BINDIR}) diff --git a/src/cct.c b/src/cct.c index 8dd1e0ad12..3097b1f692 100644 --- a/src/cct.c +++ b/src/cct.c @@ -80,13 +80,11 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-25/2017-10-26 #include "proj.h" #include "proj_internal.h" +#include "proj_strtod.h" #include "projects.h" #include "optargpm.h" -/* Prototypes for functions in proj_strtod.c */ -double proj_strtod(const char *str, char **endptr); -double proj_atof(const char *str); static void logger(void *data, int level, const char *msg); static void print(PJ_LOG_LEVEL log_level, const char *fmt, ...); diff --git a/src/gie.c b/src/gie.c index e0effaa490..4f937a3500 100644 --- a/src/gie.c +++ b/src/gie.c @@ -116,6 +116,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-10-01/2017-10-08 #include "proj.h" #include "proj_internal.h" #include "proj_math.h" +#include "proj_strtod.h" #include "projects.h" #include "optargpm.h" @@ -154,10 +155,6 @@ static const char *gie_tags[] = { static const size_t n_gie_tags = sizeof gie_tags / sizeof gie_tags[0]; -/* from proj_strtod.c */ -double proj_strtod(const char *str, char **endptr); -double proj_atof(const char *str); - int main(int argc, char **argv); static int dispatch (const char *cmnd, const char *args); diff --git a/src/proj_strtod.c b/src/proj_strtod.c index fa68346505..ad197d2a6f 100644 --- a/src/proj_strtod.c +++ b/src/proj_strtod.c @@ -85,6 +85,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-01-17/2017-09-18 ***********************************************************************/ +#include "proj_strtod.h" #include /* for abs */ #include /* for strchr */ @@ -93,9 +94,6 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-01-17/2017-09-18 #include /* for HUGE_VAL */ #include /* for pow() */ -double proj_strtod(const char *str, char **endptr); -double proj_atof(const char *str); - double proj_strtod(const char *str, char **endptr) { double number = 0, integral_part = 0; @@ -321,8 +319,6 @@ double proj_atof(const char *str) { /* compile/run: gcc -DTEST -o proj_strtod_test proj_strtod.c && proj_strtod_test */ #include -#include -#include char *un_underscore (char *s) { static char u[1024]; diff --git a/src/proj_strtod.h b/src/proj_strtod.h new file mode 100644 index 0000000000..38c2d1f40b --- /dev/null +++ b/src/proj_strtod.h @@ -0,0 +1,4 @@ +/* Internal header for proj_strtod.c */ + +double proj_strtod(const char *str, char **endptr); +double proj_atof(const char *str);