X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=17d59e8d8850dba638ccb4a3eac35ec9f45bbfe5;hb=5874e88d83cabbec62e36c37e9016fab983d957b;hp=6c6538446eb84e4090beb05dcf2402c77908ac42;hpb=9e4f8cf93b465fb34b35b083935f45ba5427045e;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 6c653844..17d59e8d 100644
--- a/strutil.c
+++ b/strutil.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "strutil: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "strutil"
 
 /**
  * @file
@@ -49,6 +42,8 @@
  */
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to a long integer. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid long integer. The function sets errno according to the details of the
@@ -61,7 +56,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;
@@ -80,6 +75,8 @@ SR_API int sr_atol(const char *str, long *ret)
 }
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to an integer. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid integer. The function sets errno according to the details of the
@@ -92,7 +89,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;
 
@@ -109,6 +106,8 @@ SR_API int sr_atoi(const char *str, int *ret)
 }
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to a double. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid double. The function sets errno according to the details of the
@@ -121,7 +120,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;
@@ -140,6 +139,8 @@ SR_API int sr_atod(const char *str, double *ret)
 }
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to a float. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid float. The function sets errno according to the details of the
@@ -152,7 +153,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;
 
@@ -191,7 +192,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
 		SR_GHZ(1000), SR_GHZ(1000 * 1000), SR_GHZ(1000 * 1000 * 1000),
 	};
 	const char *p, prefix[] = "\0kMGTPE";
-	char fmt[8], fract[20] = "", *f;
+	char fmt[16], fract[20] = "", *f;
 
 	if (unit == NULL)
 		unit = "";
@@ -199,7 +200,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
 	for (i = 0; (quot = x / divisor[i]) >= 1000; i++);
 
 	if (i) {
-		sprintf(fmt, ".%%0%dlu", i * 3);
+		sprintf(fmt, ".%%0%d"PRIu64, i * 3);
 		f = fract + sprintf(fract, fmt, x % divisor[i]) - 1;
 
 		while (f >= fract && strchr("0.", *f))