summaryrefslogtreecommitdiffstats
path: root/src/util.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-12-24 07:09:09 -0800
committerMarcel Holtmann <marcel@holtmann.org>2009-12-24 07:09:09 -0800
commit0b359e89dba1da799393eb8d098475fd643159fe (patch)
tree87143dc08a9168c8d9938844818bc427ddf80e1f /src/util.c
parent2876e1aa64dfcdcb17248cf41b41512977ebcbc2 (diff)
downloadofono-0b359e89dba1da799393eb8d098475fd643159fe.tar.bz2
Use error label instead of err or err_out
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util.c b/src/util.c
index 9f6cfdc2..2a74e97c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -555,7 +555,7 @@ char *convert_gsm_to_utf8_with_lang(const unsigned char *text, long len,
return NULL;
if (len < 0 && !terminator)
- goto err_out;
+ goto error;
if (len < 0) {
i = 0;
@@ -570,17 +570,17 @@ char *convert_gsm_to_utf8_with_lang(const unsigned char *text, long len,
unsigned short c;
if (text[i] > 0x7f)
- goto err_out;
+ goto error;
if (text[i] == 0x1b) {
++i;
if (i >= len)
- goto err_out;
+ goto error;
c = gsm_single_shift_lookup(text[i], single_lang);
if (c == GUND)
- goto err_out;
+ goto error;
} else {
c = gsm_locking_shift_lookup(text[i], locking_lang);
}
@@ -591,7 +591,7 @@ char *convert_gsm_to_utf8_with_lang(const unsigned char *text, long len,
res = g_malloc(res_length + 1);
if (!res)
- goto err_out;
+ goto error;
out = res;
@@ -614,7 +614,7 @@ char *convert_gsm_to_utf8_with_lang(const unsigned char *text, long len,
if (items_written)
*items_written = out - res;
-err_out:
+error:
if (items_read)
*items_read = i;