* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
/** @cond PRIVATE */
*
* @retval SR_OK Conversion successful.
* @retval SR_ERR Failure.
- *
- * @since 0.3.0
*/
SR_PRIV int sr_atol(const char *str, long *ret)
{
*
* @retval SR_OK Conversion successful.
* @retval SR_ERR Failure.
- *
- * @since 0.3.0
*/
SR_PRIV int sr_atoi(const char *str, int *ret)
{
*
* @retval SR_OK Conversion successful.
* @retval SR_ERR Failure.
- *
- * @since 0.3.0
*/
SR_PRIV int sr_atod(const char *str, double *ret)
{
*
* @retval SR_OK Conversion successful.
* @retval SR_ERR Failure.
- *
- * @since 0.3.0
*/
SR_PRIV int sr_atof(const char *str, float *ret)
{
*
* @retval SR_OK Conversion successful.
* @retval SR_ERR Failure.
- *
- * @since 0.3.0
*/
SR_PRIV int sr_atof_ascii(const char *str, float *ret)
{
* @param unit The unit to append to the string, or NULL if the string
* has no units.
*
- * @return A g_try_malloc()ed string representation of the samplerate value,
+ * @return A newly allocated string representation of the samplerate value,
* or NULL upon errors. The caller is responsible to g_free() the
* memory.
*
const char *p, prefix[] = "\0kMGTPE";
char fmt[16], fract[20] = "", *f;
- if (unit == NULL)
+ if (!unit)
unit = "";
for (i = 0; (quot = x / divisor[i]) >= 1000; i++);
*
* @param samplerate The samplerate in Hz.
*
- * @return A g_try_malloc()ed string representation of the samplerate value,
+ * @return A newly allocated string representation of the samplerate value,
* or NULL upon errors. The caller is responsible to g_free() the
* memory.
*
*
* @param frequency The frequency in Hz.
*
- * @return A g_try_malloc()ed string representation of the frequency value,
+ * @return A newly allocated string representation of the frequency value,
* or NULL upon errors. The caller is responsible to g_free() the
* memory.
*
int r;
/* Allocate enough for a uint64_t as string + " ms". */
- if (!(o = g_try_malloc0(30 + 1))) {
- sr_err("%s: o malloc failed", __func__);
- return NULL;
- }
+ o = g_malloc0(30 + 1);
if (frequency >= SR_GHZ(1))
r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
* @param v_p The voltage numerator.
* @param v_q The voltage denominator.
*
- * @return A g_try_malloc()ed string representation of the voltage value,
+ * @return A newly allocated string representation of the voltage value,
* or NULL upon errors. The caller is responsible to g_free() the
* memory.
*
int r;
char *o;
- if (!(o = g_try_malloc0(30 + 1))) {
- sr_err("%s: o malloc failed", __func__);
- return NULL;
- }
+ o = g_malloc0(30 + 1);
if (v_q == 1000)
r = snprintf(o, 30, "%" PRIu64 "mV", v_p);
} else
*size += frac_part;
- if (s && *s && strcasecmp(s, "Hz"))
+ if (s && *s && g_ascii_strcasecmp(s, "Hz"))
return SR_ERR;
return SR_OK;
if (s && *s) {
while (*s == ' ')
s++;
- if (!strcasecmp(s, "mv"))
+ if (!g_ascii_strcasecmp(s, "mv"))
*q = 1000L;
- else if (!strcasecmp(s, "v"))
+ else if (!g_ascii_strcasecmp(s, "v"))
*q = 1;
else
/* Must have a base suffix. */