BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

strutil.c: Don't expose sr_atox() as API calls for now.

This commit is contained in:
Uwe Hermann 2013-12-03 17:16:59 +01:00
parent 082972e8c5
commit 8d558c7a9f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsigrok-internal.h
View File

@ -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, SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
std_dev_clear_t clear_private); 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 ----------------------------------------------*/ /*--- hardware/common/serial.c ----------------------------------------------*/
#ifdef HAVE_LIBSERIALPORT #ifdef HAVE_LIBSERIALPORT

4
proto.h
View File

@ -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 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_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_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 -------------------------------------------------------------*/ /*--- version.c -------------------------------------------------------------*/

8
strutil.c
View File

@ -61,7 +61,7 @@
* *
* @since 0.3.0 * @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; long tmp;
char *endptr = NULL; char *endptr = NULL;
@ -92,7 +92,7 @@ SR_API int sr_atol(const char *str, long *ret)
* *
* @since 0.3.0 * @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; long tmp;
@ -121,7 +121,7 @@ SR_API int sr_atoi(const char *str, int *ret)
* *
* @since 0.3.0 * @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; double tmp;
char *endptr = NULL; char *endptr = NULL;
@ -152,7 +152,7 @@ SR_API int sr_atod(const char *str, double *ret)
* *
* @since 0.3.0 * @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; double tmp;