diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 11:48:58 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 15:54:50 +0100 |
commit | 72daa122b6a4a9562109299d0b747c71aac1e483 (patch) | |
tree | cc1dff80e1e89158b0cac778433fcea5c08ae5f9 /package/config/kxgettext.c | |
parent | 359a922659c6b33c44ab7c4f94de7d801a8bea63 (diff) |
package/config: rebase against 2.6.37-rc1
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/kxgettext.c')
-rw-r--r-- | package/config/kxgettext.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/package/config/kxgettext.c b/package/config/kxgettext.c index dcc3fcc0c..e9d8e791b 100644 --- a/package/config/kxgettext.c +++ b/package/config/kxgettext.c @@ -63,11 +63,11 @@ next: struct file_line { struct file_line *next; - char* file; - int lineno; + const char *file; + int lineno; }; -static struct file_line *file_line__new(char *file, int lineno) +static struct file_line *file_line__new(const char *file, int lineno) { struct file_line *self = malloc(sizeof(*self)); @@ -90,7 +90,8 @@ struct message { static struct message *message__list; -static struct message *message__new(const char *msg, char *option, char *file, int lineno) +static struct message *message__new(const char *msg, char *option, + const char *file, int lineno) { struct message *self = malloc(sizeof(*self)); @@ -130,7 +131,8 @@ static struct message *mesage__find(const char *msg) return m; } -static int message__add_file_line(struct message *self, char *file, int lineno) +static int message__add_file_line(struct message *self, const char *file, + int lineno) { int rc = -1; struct file_line *fl = file_line__new(file, lineno); @@ -145,7 +147,8 @@ out: return rc; } -static int message__add(const char *msg, char *option, char *file, int lineno) +static int message__add(const char *msg, char *option, const char *file, + int lineno) { int rc = 0; char bf[16384]; |