From b6b192b49333ff18e1a4df53f27fc4873bf1ac25 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 9 May 2016 11:40:34 +0200 Subject: fix function names get_query_value() -> cqr_get_query_uint() --- lib/libcqrlogo.c | 10 +++++----- lib/libcqrlogo.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libcqrlogo.c b/lib/libcqrlogo.c index 82b394d..d2690ab 100644 --- a/lib/libcqrlogo.c +++ b/lib/libcqrlogo.c @@ -233,8 +233,8 @@ struct cqr_png * cqr_encode_qrcode_to_png(const char *text, const struct cqr_con return png; } -/*** get_query_value ***/ -unsigned int get_query_value(const char *query_string, const char *pattern, +/*** cqr_get_query_uint ***/ +unsigned int cqr_get_query_uint(const char *query_string, const char *pattern, unsigned int value, unsigned int min, unsigned int max) { char *match = NULL, *newpattern = NULL; unsigned int length; @@ -316,11 +316,11 @@ void cqr_conf_string(const char * query_string, struct cqr_conf * conf) { return; /* do we have a special scale? */ - conf->scale = get_query_value(query_string, "scale", conf->scale, 1, QRCODE_MAX_SCALE); + conf->scale = cqr_get_query_uint(query_string, "scale", conf->scale, 1, QRCODE_MAX_SCALE); /* width of the border? */ - conf->border = get_query_value(query_string, "border", conf->border, 0, QRCODE_MAX_BORDER); + conf->border = cqr_get_query_uint(query_string, "border", conf->border, 0, QRCODE_MAX_BORDER); /* error correction level? */ - conf->level = get_query_value(query_string, "level", conf->level, QR_ECLEVEL_L, QR_ECLEVEL_H); + conf->level = cqr_get_query_uint(query_string, "level", conf->level, QR_ECLEVEL_L, QR_ECLEVEL_H); } diff --git a/lib/libcqrlogo.h b/lib/libcqrlogo.h index 110a0ab..4be5087 100644 --- a/lib/libcqrlogo.h +++ b/lib/libcqrlogo.h @@ -77,8 +77,8 @@ struct cqr_png * cqr_bitmap_to_png(struct cqr_bitmap *bitmap, const char *text, /*** cqr_encode_qrcode_to_png ***/ struct cqr_png * cqr_encode_qrcode_to_png(const char *text, const struct cqr_conf conf, const uint8_t meta); -/*** cqr_get_query_value ***/ -unsigned int cqr_get_query_value(const char *query_string, const char *pattern, +/*** cqr_get_query_uint ***/ +unsigned int cqr_get_query_uint(const char *query_string, const char *pattern, unsigned int value, unsigned int min, unsigned int max); /*** cqr_get_ini_value ***/ unsigned int cqr_get_ini_value(dictionary * ini, uint8_t type, const char * section, const char * parameter, -- cgit v1.2.3-54-g00ecf