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

sr_parse_(period|voltage): deprecate struct sr_rational

This commit is contained in:
Bert Vermeulen 2013-03-30 14:41:01 +01:00
parent d00088ca6d
commit 76e107d68c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proto.h
View File

@ -128,8 +128,8 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size); SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size);
SR_API uint64_t sr_parse_timestring(const char *timestring); 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, struct sr_rational *r); SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q);
SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r); SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q);
/*--- version.c -------------------------------------------------------------*/ /*--- version.c -------------------------------------------------------------*/

28
strutil.c
View File

@ -393,12 +393,12 @@ SR_API gboolean sr_parse_boolstring(const char *boolstr)
return FALSE; return FALSE;
} }
SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r) SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q)
{ {
char *s; char *s;
r->p = strtoull(periodstr, &s, 10); *p = strtoull(periodstr, &s, 10);
if (r->p == 0 && s == periodstr) if (*p == 0 && s == periodstr)
/* No digits found. */ /* No digits found. */
return SR_ERR_ARG; return SR_ERR_ARG;
@ -406,17 +406,17 @@ SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r)
while (*s == ' ') while (*s == ' ')
s++; s++;
if (!strcmp(s, "fs")) if (!strcmp(s, "fs"))
r->q = 1000000000000000ULL; *q = 1000000000000000ULL;
else if (!strcmp(s, "ps")) else if (!strcmp(s, "ps"))
r->q = 1000000000000ULL; *q = 1000000000000ULL;
else if (!strcmp(s, "ns")) else if (!strcmp(s, "ns"))
r->q = 1000000000ULL; *q = 1000000000ULL;
else if (!strcmp(s, "us")) else if (!strcmp(s, "us"))
r->q = 1000000; *q = 1000000;
else if (!strcmp(s, "ms")) else if (!strcmp(s, "ms"))
r->q = 1000; *q = 1000;
else if (!strcmp(s, "s")) else if (!strcmp(s, "s"))
r->q = 1; *q = 1;
else else
/* Must have a time suffix. */ /* Must have a time suffix. */
return SR_ERR_ARG; return SR_ERR_ARG;
@ -426,12 +426,12 @@ SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r)
} }
SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r) SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q)
{ {
char *s; char *s;
r->p = strtoull(voltstr, &s, 10); *p = strtoull(voltstr, &s, 10);
if (r->p == 0 && s == voltstr) if (*p == 0 && s == voltstr)
/* No digits found. */ /* No digits found. */
return SR_ERR_ARG; return SR_ERR_ARG;
@ -439,9 +439,9 @@ SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r)
while (*s == ' ') while (*s == ' ')
s++; s++;
if (!strcasecmp(s, "mv")) if (!strcasecmp(s, "mv"))
r->q = 1000L; *q = 1000L;
else if (!strcasecmp(s, "v")) else if (!strcasecmp(s, "v"))
r->q = 1; *q = 1;
else else
/* Must have a base suffix. */ /* Must have a base suffix. */
return SR_ERR_ARG; return SR_ERR_ARG;