diff options
author | uranther <jwheaton@purdue.edu> | 2009-06-10 17:15:29 -0400 |
---|---|---|
committer | uranther <jwheaton@purdue.edu> | 2009-06-10 17:15:29 -0400 |
commit | 472542d39ac6b18ced0926a0997b435b1dc0a0b5 (patch) | |
tree | ec85bc745add616fed07043b8bd2baff5be9bc2c | |
parent | c9290bc5a97062e2c429124bef34b9449c0f071c (diff) |
Cleaner handling of G_TOKEN_INT, and added G_TOKEN_ERROR error message
-rw-r--r-- | uzbl.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1100,9 +1100,7 @@ expand_template(const char *template, gboolean escape_markup) { } } else if(token == G_TOKEN_INT) { - buf = itos(g_scanner_cur_value(uzbl.scan).v_int); - g_string_append(ret, buf); - g_free(buf); + g_string_append_printf(ret, "%lu", g_scanner_cur_value(uzbl.scan).v_int); } else if(token == G_TOKEN_IDENTIFIER) { g_string_append(ret, (gchar *)g_scanner_cur_value(uzbl.scan).v_identifier); @@ -1110,6 +1108,12 @@ expand_template(const char *template, gboolean escape_markup) { else if(token == G_TOKEN_CHAR) { g_string_append_c(ret, (gchar)g_scanner_cur_value(uzbl.scan).v_char); } + else if(token == G_TOKEN_ERROR) { + g_scanner_error(uzbl.scan, "Token error in template ('%s') at line %d, column %d.", + template, + g_scanner_cur_line(uzbl.scan), + g_scanner_cur_position(uzbl.scan)); + } } return g_string_free(ret, FALSE); |