diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/misc.c | 2 | ||||
-rw-r--r-- | apps/misc.h | 2 | ||||
-rw-r--r-- | apps/tagcache.c | 2 | ||||
-rw-r--r-- | apps/tagtree.c | 8 |
4 files changed, 10 insertions, 4 deletions
diff --git a/apps/misc.c b/apps/misc.c index 68775b36f5..1f945c5431 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -170,7 +170,7 @@ bool warn_on_pl_erase(void) | |||
170 | 170 | ||
171 | /* Performance optimized version of the read_line() (see below) function. */ | 171 | /* Performance optimized version of the read_line() (see below) function. */ |
172 | int fast_readline(int fd, char *buf, int buf_size, void *parameters, | 172 | int fast_readline(int fd, char *buf, int buf_size, void *parameters, |
173 | int (*callback)(int n, const char *buf, void *parameters)) | 173 | int (*callback)(int n, char *buf, void *parameters)) |
174 | { | 174 | { |
175 | char *p, *next; | 175 | char *p, *next; |
176 | int rc, pos = 0; | 176 | int rc, pos = 0; |
diff --git a/apps/misc.h b/apps/misc.h index 0fd408b941..0b155db1ec 100644 --- a/apps/misc.h +++ b/apps/misc.h | |||
@@ -57,7 +57,7 @@ bool warn_on_pl_erase(void); | |||
57 | */ | 57 | */ |
58 | int read_line(int fd, char* buffer, int buffer_size); | 58 | int read_line(int fd, char* buffer, int buffer_size); |
59 | int fast_readline(int fd, char *buf, int buf_size, void *parameters, | 59 | int fast_readline(int fd, char *buf, int buf_size, void *parameters, |
60 | int (*callback)(int n, const char *buf, void *parameters)); | 60 | int (*callback)(int n, char *buf, void *parameters)); |
61 | 61 | ||
62 | bool settings_parseline(char* line, char** name, char** value); | 62 | bool settings_parseline(char* line, char** name, char** value); |
63 | long default_event_handler_ex(long event, void (*callback)(void *), void *parameter); | 63 | long default_event_handler_ex(long event, void (*callback)(void *), void *parameter); |
diff --git a/apps/tagcache.c b/apps/tagcache.c index c5a8dcbae5..f2423243b7 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -3350,7 +3350,7 @@ static bool read_tag(char *dest, long size, | |||
3350 | return false; | 3350 | return false; |
3351 | } | 3351 | } |
3352 | 3352 | ||
3353 | static int parse_changelog_line(int line_n, const char *buf, void *parameters) | 3353 | static int parse_changelog_line(int line_n, char *buf, void *parameters) |
3354 | { | 3354 | { |
3355 | struct index_entry idx; | 3355 | struct index_entry idx; |
3356 | char tag_data[TAG_MAXLEN+32]; | 3356 | char tag_data[TAG_MAXLEN+32]; |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 653fd6be93..3df8d9db2b 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -852,15 +852,21 @@ bool tagtree_import(void) | |||
852 | 852 | ||
853 | static bool parse_menu(const char *filename); | 853 | static bool parse_menu(const char *filename); |
854 | 854 | ||
855 | static int parse_line(int n, const char *buf, void *parameters) | 855 | static int parse_line(int n, char *buf, void *parameters) |
856 | { | 856 | { |
857 | char data[256]; | 857 | char data[256]; |
858 | int variable; | 858 | int variable; |
859 | static bool read_menu; | 859 | static bool read_menu; |
860 | int i; | 860 | int i; |
861 | char *p; | ||
861 | 862 | ||
862 | (void)parameters; | 863 | (void)parameters; |
863 | 864 | ||
865 | /* Strip possible <CR> at end of line. */ | ||
866 | p = strchr(buf, '\r'); | ||
867 | if (p != NULL) | ||
868 | *p = '\0'; | ||
869 | |||
864 | logf("parse:%d/%s", n, buf); | 870 | logf("parse:%d/%s", n, buf); |
865 | 871 | ||
866 | /* First line, do initialisation. */ | 872 | /* First line, do initialisation. */ |