diff -NpuBr -Xexclude.txt main/codec-cfg.c sherpya/codec-cfg.c --- main/codec-cfg.c 2008-05-29 21:12:13.750000000 +0200 +++ sherpya/codec-cfg.c 2008-07-18 09:51:08.625000000 +0200 @@ -323,7 +323,7 @@ static short get_driver(char *s,int audi static int validate_codec(codecs_t *c, int type) { unsigned int i; - char *tmp_name = c->name; + unsigned char *tmp_name = c->name; for (i = 0; i < strlen(tmp_name) && isalnum(tmp_name[i]); i++) /* NOTHING */; @@ -417,8 +417,8 @@ err_out_parse_error: static FILE *fp; static int line_num = 0; -static char *line; -static char *token[MAX_NR_TOKEN]; +static unsigned char *line; +static unsigned char *token[MAX_NR_TOKEN]; static int read_nextline = 1; static int get_token(int min, int max) diff -NpuBr -Xexclude.txt main/libao2/ao_alsa.c sherpya/libao2/ao_alsa.c --- main/libao2/ao_alsa.c 2008-07-17 19:52:45.656250000 +0200 +++ sherpya/libao2/ao_alsa.c 2008-07-18 09:51:08.625000000 +0200 @@ -262,7 +262,7 @@ static int str_maxlen(strarg_t *str) { static int try_open_device(const char *device, int open_mode, int try_ac3) { int err, len; - char *ac3_device, *args; + unsigned char *ac3_device, *args; if (try_ac3) { /* to set the non-audio bit, use AES0=6 */ diff -NpuBr -Xexclude.txt main/libavcodec/eval.c sherpya/libavcodec/eval.c --- main/libavcodec/eval.c 2008-07-10 19:30:47.062500000 +0200 +++ sherpya/libavcodec/eval.c 2008-07-18 09:51:08.640625000 +0200 @@ -384,7 +384,7 @@ AVEvalExpr * ff_parse(const char *s, con char w[strlen(s) + 1], * wp = w; while (*s) - if (!isspace(*s++)) *wp++ = s[-1]; + if (!isspace((unsigned char) *s++)) *wp++ = s[-1]; *wp++ = 0; p.stack_index=100; diff -NpuBr -Xexclude.txt main/libavformat/avformat.h sherpya/libavformat/avformat.h --- main/libavformat/avformat.h 2008-07-15 16:23:50.046875000 +0200 +++ sherpya/libavformat/avformat.h 2008-07-18 09:51:08.656250000 +0200 @@ -1020,7 +1020,7 @@ int find_info_tag(char *arg, int arg_siz * @param number frame number * @return 0 if OK, -1 if format error. */ -int av_get_frame_filename(char *buf, int buf_size, +int av_get_frame_filename(unsigned char *buf, int buf_size, const char *path, int number); /** diff -NpuBr -Xexclude.txt main/libavformat/avio.c sherpya/libavformat/avio.c --- main/libavformat/avio.c 2008-05-11 22:59:02.187500000 +0200 +++ sherpya/libavformat/avio.c 2008-07-18 09:51:08.656250000 +0200 @@ -63,7 +63,7 @@ int url_open(URLContext **puc, const cha { URLContext *uc; URLProtocol *up; - const char *p; + const unsigned char *p; char proto_str[128], *q; int err; diff -NpuBr -Xexclude.txt main/libavformat/cutils.c sherpya/libavformat/cutils.c --- main/libavformat/cutils.c 2008-05-25 16:35:16.562500000 +0200 +++ sherpya/libavformat/cutils.c 2008-07-18 09:51:08.671875000 +0200 @@ -106,7 +106,7 @@ static int date_get_num(const char **pp, val = 0; for(i = 0; i < len_max; i++) { c = *p; - if (!isdigit(c)) + if (!isdigit((unsigned char) c)) break; val = (val * 10) + c - '0'; p++; diff -NpuBr -Xexclude.txt main/libavformat/http.c sherpya/libavformat/http.c --- main/libavformat/http.c 2008-05-11 22:59:02.093750000 +0200 +++ sherpya/libavformat/http.c 2008-07-18 09:51:08.687500000 +0200 @@ -151,11 +151,11 @@ static int http_getc(HTTPContext *s) return *s->buf_ptr++; } -static int process_line(URLContext *h, char *line, int line_count, +static int process_line(URLContext *h, unsigned char *line, int line_count, int *new_location) { HTTPContext *s = h->priv_data; - char *tag, *p; + unsigned char *tag, *p; /* end of header */ if (line[0] == '\0') diff -NpuBr -Xexclude.txt main/libavformat/utils.c sherpya/libavformat/utils.c --- main/libavformat/utils.c 2008-07-18 09:45:03.140625000 +0200 +++ sherpya/libavformat/utils.c 2008-07-18 09:51:08.703125000 +0200 @@ -2808,7 +2808,7 @@ int64_t av_gettime(void) int64_t parse_date(const char *datestr, int duration) { - const char *p; + const unsigned char *p; int64_t t; struct tm dt; int i; @@ -2820,7 +2820,7 @@ int64_t parse_date(const char *datestr, "%H:%M:%S", "%H%M%S", }; - const char *q; + const unsigned char *q; int is_utc, len; char lastch; int negative = 0; @@ -2961,11 +2961,11 @@ int find_info_tag(char *arg, int arg_siz return 0; } -int av_get_frame_filename(char *buf, int buf_size, +int av_get_frame_filename(unsigned char *buf, int buf_size, const char *path, int number) { - const char *p; - char *q, buf1[20], c; + const unsigned char *p; + unsigned char *q, buf1[20], c; int nd, len, percentd_found; q = buf; diff -NpuBr -Xexclude.txt main/libmpdemux/demux_mkv.c sherpya/libmpdemux/demux_mkv.c --- main/libmpdemux/demux_mkv.c 2008-05-19 22:40:51.109375000 +0200 +++ sherpya/libmpdemux/demux_mkv.c 2008-07-18 09:51:08.718750000 +0200 @@ -269,7 +269,7 @@ vobsub_parse_size (sh_sub_t *sh, const c } static int -vobsub_parse_palette (sh_sub_t *sh, const char *start) +vobsub_parse_palette (sh_sub_t *sh, const unsigned char *start) { int i; @@ -306,7 +306,7 @@ vobsub_parse_palette (sh_sub_t *sh, cons } static int -vobsub_parse_custom_colors (sh_sub_t *sh, const char *start) +vobsub_parse_custom_colors (sh_sub_t *sh, const unsigned char *start) { int use_custom_colors, i; const char *p; @@ -356,7 +356,7 @@ vobsub_parse_custom_colors (sh_sub_t *sh } static int -vobsub_parse_forced_subs (sh_sub_t *sh, const char *start) +vobsub_parse_forced_subs (sh_sub_t *sh, const unsigned char *start) { start += 12; while (isspace(*start)) diff -NpuBr -Xexclude.txt main/libmpdemux/mf.c sherpya/libmpdemux/mf.c --- main/libmpdemux/mf.c 2008-04-30 08:18:28.187500000 +0200 +++ sherpya/libmpdemux/mf.c 2008-07-18 09:51:08.734375000 +0200 @@ -49,7 +49,7 @@ mf_t* open_mf(char * filename){ while ( fgets( fname,255,lst_f ) ) { /* remove spaces from end of fname */ - char *t=fname + strlen( fname ) - 1; + unsigned char *t=fname + strlen( fname ) - 1; while ( t > fname && isspace( *t ) ) *(t--)=0; if ( stat( fname,&fs ) ) { diff -NpuBr -Xexclude.txt main/libvo/vo_fbdev.c sherpya/libvo/vo_fbdev.c --- main/libvo/vo_fbdev.c 2008-05-19 22:40:45.968750000 +0200 +++ sherpya/libvo/vo_fbdev.c 2008-07-18 09:51:08.734375000 +0200 @@ -84,8 +84,8 @@ static int validate_mode(fb_mode_t *m) static FILE *fp; static int line_num = 0; -static char *line; -static char *token[MAX_NR_TOKEN]; +static unsigned char *line; +static unsigned char *token[MAX_NR_TOKEN]; static int get_token(int num) { diff -NpuBr -Xexclude.txt main/parser-cfg.c sherpya/parser-cfg.c --- main/parser-cfg.c 2008-04-30 08:18:31.015625000 +0200 +++ sherpya/parser-cfg.c 2008-07-18 09:51:08.750000000 +0200 @@ -42,10 +42,10 @@ int m_config_parse_config_file(m_config_ #define MAX_OPT_LEN 1000 #define MAX_PARAM_LEN 1500 FILE *fp; - char *line; - char opt[MAX_OPT_LEN + 1]; - char param[MAX_PARAM_LEN + 1]; - char c; /* for the "" and '' check */ + unsigned char *line; + unsigned char opt[MAX_OPT_LEN + 1]; + unsigned char param[MAX_PARAM_LEN + 1]; + unsigned char c; /* for the "" and '' check */ int tmp; int line_num = 0; int line_pos; /* line pos */ diff -NpuBr -Xexclude.txt main/stream/stream_dvd.c sherpya/stream/stream_dvd.c --- main/stream/stream_dvd.c 2008-07-15 16:23:18.984375000 +0200 +++ sherpya/stream/stream_dvd.c 2008-07-18 09:51:08.750000000 +0200 @@ -159,8 +159,8 @@ static const struct m_struct_st stream_o stream_opts_fields }; -int dvd_parse_chapter_range(const m_option_t *conf, const char *range) { - const char *s; +int dvd_parse_chapter_range(const m_option_t *conf, const unsigned char *range) { + const unsigned char *s; char *t; if (!range) return M_OPT_MISSING_PARAM; diff -NpuBr -Xexclude.txt main/stream/tv.c sherpya/stream/tv.c --- main/stream/tv.c 2008-07-10 19:30:22.671875000 +0200 +++ sherpya/stream/tv.c 2008-07-18 09:51:08.765625000 +0200 @@ -504,7 +504,7 @@ static int open_tv(tvi_handle_t *tvh) int channel = 0; if (tvh->tv_param->channel) { - if (isdigit(*tvh->tv_param->channel)) + if (isdigit((unsigned char) *tvh->tv_param->channel)) /* if tvh->tv_param->channel begins with a digit interpret it as a number */ channel = atoi(tvh->tv_param->channel); else diff -NpuBr -Xexclude.txt main/stream/udp.c sherpya/stream/udp.c --- main/stream/udp.c 2008-05-19 22:40:37.781250000 +0200 +++ sherpya/stream/udp.c 2008-07-18 09:51:08.781250000 +0200 @@ -72,7 +72,7 @@ udp_open_socket (URL_t *url) return -1; } - if (isalpha (url->hostname[0])) + if (isalpha ((unsigned char) url->hostname[0])) { #ifndef HAVE_WINSOCK2 hp = (struct hostent *) gethostbyname (url->hostname); @@ -123,7 +123,7 @@ udp_open_socket (URL_t *url) } #ifdef HAVE_WINSOCK2 - if (isalpha (url->hostname[0])) + if (isalpha ((unsigned char) url->hostname[0])) { hp = (struct hostent *) gethostbyname (url->hostname); if (!hp) diff -NpuBr -Xexclude.txt main/subreader.c sherpya/subreader.c --- main/subreader.c 2008-05-29 21:12:13.796875000 +0200 +++ sherpya/subreader.c 2008-07-18 09:51:08.796875000 +0200 @@ -67,12 +67,12 @@ int sub_format=SUB_INVALID; unsigned long previous_sub_end; #endif -static int eol(char p) { +static int eol(unsigned char p) { return p=='\r' || p=='\n' || p=='\0'; } /* Remove leading and trailing space */ -static void trail_space(char *s) { +static void trail_space(unsigned char *s) { int i = 0; while (isspace(s[i])) ++i; if (i) strcpy(s, s + i); @@ -625,8 +625,8 @@ static void sub_pp_ssa(subtitle *sub) { * by set, based on code by szabi (dunnowhat sub format ;-) */ static subtitle *sub_read_line_pjs(stream_t *st,subtitle *current) { - char line[LINE_LEN+1]; - char text[LINE_LEN+1], *s, *d; + unsigned char line[LINE_LEN+1]; + unsigned char text[LINE_LEN+1], *s, *d; if (!stream_read_line (st, line, LINE_LEN)) return NULL; @@ -666,7 +666,7 @@ static subtitle *sub_read_line_mpsub(str char line[LINE_LEN+1]; float a,b; int num=0; - char *p, *q; + unsigned char *p, *q; do { @@ -818,7 +818,7 @@ static subtitle *sub_read_line_subrip09( static subtitle *sub_read_line_jacosub(stream_t* st, subtitle * current) { - char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q; + unsigned char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q; unsigned a1, a2, a3, a4, b1, b2, b3, b4, comment = 0; static unsigned jacoTimeres = 30; static int jacoShift = 0; @@ -1723,7 +1723,7 @@ char * strreplace( char * in,char * what #endif -static void strcpy_trim(char *d, char *s) +static void strcpy_trim(unsigned char *d, unsigned char *s) { // skip leading whitespace while (*s && !isalnum(*s)) { @@ -1773,7 +1773,7 @@ static void strcpy_get_ext(char *d, char } } -static int whiteonly(char *s) +static int whiteonly(unsigned char *s) { while (*s) { if (isalnum(*s)) return 0; diff -NpuBr -Xexclude.txt main/vobsub.c sherpya/vobsub.c --- main/vobsub.c 2008-05-19 22:40:52.531250000 +0200 +++ sherpya/vobsub.c 2008-07-18 09:51:08.796875000 +0200 @@ -226,7 +226,7 @@ typedef FILE rar_stream_t; /**********************************************************************/ static ssize_t -vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream) +vobsub_getline(unsigned char **lineptr, size_t *n, rar_stream_t *stream) { size_t res = 0; int c; @@ -236,7 +236,7 @@ vobsub_getline(char **lineptr, size_t *n *n = 4096; } else if (*n == 0) { - char *tmp = realloc(*lineptr, 4096); + unsigned char *tmp = realloc(*lineptr, 4096); if (tmp) { *lineptr = tmp; *n = 4096; @@ -684,11 +684,11 @@ vobsub_add_timestamp(vobsub_t *vob, off_ } static int -vobsub_parse_id(vobsub_t *vob, const char *line) +vobsub_parse_id(vobsub_t *vob, const unsigned char *line) { // id: xx, index: n size_t idlen; - const char *p, *q; + const unsigned char *p, *q; p = line; while (isspace(*p)) ++p; @@ -712,10 +712,10 @@ vobsub_parse_id(vobsub_t *vob, const cha } static int -vobsub_parse_timestamp(vobsub_t *vob, const char *line) +vobsub_parse_timestamp(vobsub_t *vob, const unsigned char *line) { // timestamp: HH:MM:SS.mmm, filepos: 0nnnnnnnnn - const char *p; + const unsigned char *p; int h, m, s, ms; off_t filepos; while (isspace(*line)) @@ -767,7 +767,7 @@ vobsub_parse_timestamp(vobsub_t *vob, co } static int -vobsub_parse_size(vobsub_t *vob, const char *line) +vobsub_parse_size(vobsub_t *vob, const unsigned char *line) { // size: WWWxHHH char *p; @@ -784,7 +784,7 @@ vobsub_parse_size(vobsub_t *vob, const c } static int -vobsub_parse_origin(vobsub_t *vob, const char *line) +vobsub_parse_origin(vobsub_t *vob, const unsigned char *line) { // org: X,Y char *p; @@ -828,13 +828,13 @@ unsigned int vobsub_rgb_to_yuv(unsigned } static int -vobsub_parse_palette(vobsub_t *vob, const char *line) +vobsub_parse_palette(vobsub_t *vob, const unsigned char *line) { // palette: XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX unsigned int n; n = 0; while (1) { - const char *p; + const unsigned char *p; int tmp; while (isspace(*line)) ++line; @@ -856,7 +856,7 @@ vobsub_parse_palette(vobsub_t *vob, cons } static int -vobsub_parse_custom(vobsub_t *vob, const char *line) +vobsub_parse_custom(vobsub_t *vob, const unsigned char *line) { //custom colors: OFF/ON(0/1) if ((strncmp("ON", line + 15, 2) == 0)||strncmp("1", line + 15, 1) == 0) @@ -869,14 +869,14 @@ vobsub_parse_custom(vobsub_t *vob, const } static int -vobsub_parse_cuspal(vobsub_t *vob, const char *line) +vobsub_parse_cuspal(vobsub_t *vob, const unsigned char *line) { //colors: XXXXXX, XXXXXX, XXXXXX, XXXXXX unsigned int n, tmp; n = 0; line += 40; while(1){ - const char *p; + const unsigned char *p; while (isspace(*line)) ++line; p=line; @@ -896,7 +896,7 @@ vobsub_parse_cuspal(vobsub_t *vob, const } static int -vobsub_parse_tridx(vobsub_t *vob, const char *line) +vobsub_parse_tridx(vobsub_t *vob, const unsigned char *line) { //tridx: XXXX int tridx, i; @@ -908,7 +908,7 @@ vobsub_parse_tridx(vobsub_t *vob, const } static int -vobsub_parse_delay(vobsub_t *vob, const char *line) +vobsub_parse_delay(vobsub_t *vob, const unsigned char *line) { int h, m, s, ms; int forward = 1; @@ -934,7 +934,7 @@ vobsub_parse_delay(vobsub_t *vob, const } static int -vobsub_set_lang(const char *line) +vobsub_set_lang(const unsigned char *line) { if (vobsub_id == -1) vobsub_id = atoi(line + 8); @@ -942,9 +942,9 @@ vobsub_set_lang(const char *line) } static int -vobsub_parse_forced_subs(vobsub_t *vob, const char *line) +vobsub_parse_forced_subs(vobsub_t *vob, const unsigned char *line) { - const char *p; + const unsigned char *p; p = line; while (isspace(*p)) @@ -967,7 +967,7 @@ vobsub_parse_one_line(vobsub_t *vob, rar ssize_t line_size; int res = -1; size_t line_reserve = 0; - char *line = NULL; + unsigned char *line = NULL; do { line_size = vobsub_getline(&line, &line_reserve, fd); if (line_size < 0) {