From: Uwe Hermann Date: Tue, 3 Dec 2013 16:16:59 +0000 (+0100) Subject: strutil.c: Don't expose sr_atox() as API calls for now. X-Git-Tag: libsigrok-0.3.0~499 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8d558c7a9fd96f60077fc2b176576846f5089110;p=libsigrok.git strutil.c: Don't expose sr_atox() as API calls for now. --- diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 970c799f..e7a97aae 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -191,6 +191,13 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi, SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver, std_dev_clear_t clear_private); +/*--- strutil.c -------------------------------------------------------------*/ + +SR_PRIV int sr_atol(const char *str, long *ret); +SR_PRIV int sr_atoi(const char *str, int *ret); +SR_PRIV int sr_atod(const char *str, double *ret); +SR_PRIV int sr_atof(const char *str, float *ret); + /*--- hardware/common/serial.c ----------------------------------------------*/ #ifdef HAVE_LIBSERIALPORT diff --git a/proto.h b/proto.h index 5b516eca..7ec6ae4f 100644 --- a/proto.h +++ b/proto.h @@ -141,10 +141,6 @@ SR_API uint64_t sr_parse_timestring(const char *timestring); SR_API gboolean sr_parse_boolstring(const char *boolstring); SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q); SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q); -SR_API int sr_atol(const char *str, long *ret); -SR_API int sr_atoi(const char *str, int *ret); -SR_API int sr_atod(const char *str, double *ret); -SR_API int sr_atof(const char *str, float *ret); /*--- version.c -------------------------------------------------------------*/ diff --git a/strutil.c b/strutil.c index 6c653844..f8644d72 100644 --- a/strutil.c +++ b/strutil.c @@ -61,7 +61,7 @@ * * @since 0.3.0 */ -SR_API int sr_atol(const char *str, long *ret) +SR_PRIV int sr_atol(const char *str, long *ret) { long tmp; char *endptr = NULL; @@ -92,7 +92,7 @@ SR_API int sr_atol(const char *str, long *ret) * * @since 0.3.0 */ -SR_API int sr_atoi(const char *str, int *ret) +SR_PRIV int sr_atoi(const char *str, int *ret) { long tmp; @@ -121,7 +121,7 @@ SR_API int sr_atoi(const char *str, int *ret) * * @since 0.3.0 */ -SR_API int sr_atod(const char *str, double *ret) +SR_PRIV int sr_atod(const char *str, double *ret) { double tmp; char *endptr = NULL; @@ -152,7 +152,7 @@ SR_API int sr_atod(const char *str, double *ret) * * @since 0.3.0 */ -SR_API int sr_atof(const char *str, float *ret) +SR_PRIV int sr_atof(const char *str, float *ret) { double tmp;