Prefix device structs with sr_.

[libsigrok.git] / output / common.c

diff --git a/output/common.c b/output/common.c
index 39eb9a02a8f63f539cf414bb7db53a2e476ef4fe..77914956607b54fa25a98c7ed7f98a85d454e786 100644 (file)
--- a/output/common.c
+++ b/output/common.c
@@ -32,13 +32,13 @@
  * @return A malloc()ed string representation of the samplerate value,
  *         or NULL upon errors. The caller is responsible to free() the memory.
  */
-char *sigrok_samplerate_string(uint64_t samplerate)
+char *sr_samplerate_string(uint64_t samplerate)
 {
        char *o;
        int r;
 
        o = malloc(30 + 1); /* Enough for a uint64_t as string + " GHz". */
-       if (o == NULL)
+       if (!o)
                return NULL;
 
        if (samplerate >= GHZ(1))
@@ -59,7 +59,6 @@ char *sigrok_samplerate_string(uint64_t samplerate)
        return o;
 }
 
-
 /**
  * Convert a numeric samplerate value to the "natural" string representation
  * of its period.
@@ -70,13 +69,13 @@ char *sigrok_samplerate_string(uint64_t samplerate)
  * @return A malloc()ed string representation of the frequency value,
  *         or NULL upon errors. The caller is responsible to free() the memory.
  */
-char *sigrok_period_string(uint64_t frequency)
+char *sr_period_string(uint64_t frequency)
 {
        char *o;
        int r;
 
        o = malloc(30 + 1); /* Enough for a uint64_t as string + " ms". */
-       if (o == NULL)
+       if (!o)
                return NULL;
 
        if (frequency >= GHZ(1))
@@ -96,4 +95,3 @@ char *sigrok_period_string(uint64_t frequency)
 
        return o;
 }
-