Skip to content

Commit 50e7c95

Browse files
build: fix all remaining -Wpointer-sign compiler warnings
1 parent b9c410b commit 50e7c95

38 files changed

Lines changed: 95 additions & 95 deletions

demux/demux_cue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static int try_open_file(struct demuxer *demuxer, enum demux_check check)
253253
if (check >= DEMUX_CHECK_UNSAFE) {
254254
char probe[PROBE_SIZE];
255255
int len = stream_read_peek(s, probe, sizeof(probe));
256-
if (len < 1 || !mp_probe_cue((bstr){probe, len}))
256+
if (len < 1 || !mp_probe_cue((bstr){(unsigned char *)probe, len}))
257257
return -1;
258258
}
259259
struct priv *p = talloc_zero(demuxer, struct priv);

demux/demux_playlist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static char *read_line(stream_t *s, char *mem, int max, int utf16)
160160
int read = 0;
161161
while (1) {
162162
// Reserve 1 byte of ptr for terminating \0.
163-
int l = read_characters(s, &mem[read], max - read - 1, utf16);
163+
int l = read_characters(s, (uint8_t *)&mem[read], max - read - 1, utf16);
164164
if (l < 0 || memchr(&mem[read], '\0', l)) {
165165
MP_WARN(s, "error reading line\n");
166166
return NULL;
@@ -252,7 +252,7 @@ static int parse_m3u(struct pl_parser *p)
252252
bstr ext = mp_get_ext(bstr0(p->real_stream->url));
253253
char probe[PROBE_SIZE];
254254
int len = stream_read_peek(p->real_stream, probe, sizeof(probe));
255-
bstr data = {probe, len};
255+
bstr data = {(unsigned char *)probe, len};
256256
if (ext.len && data.len >= 2 && maybe_text(data)) {
257257
const char *exts[] = {"m3u", "m3u8", "strm", NULL};
258258
for (int n = 0; exts[n]; n++) {

input/input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static mp_cmd_t *get_cmd_from_keys(struct input_ctx *ictx, bstr force_section,
542542
if (MP_KEY_IS_UNICODE(code)) {
543543
bstr text = {0};
544544
mp_append_utf8_bstr(ret, &text, code);
545-
ret->key_text = text.start;
545+
ret->key_text = (char *)text.start;
546546
}
547547
ret->is_mouse_button = code & MP_KEY_EMIT_ON_UP;
548548
} else {

input/ipc-unix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static MP_THREAD_VOID client_thread(void *p)
100100
int rc;
101101

102102
struct client_arg *arg = p;
103-
bstr client_msg = { talloc_strdup(NULL, ""), 0 };
103+
bstr client_msg = { (unsigned char *)talloc_strdup(NULL, ""), 0 };
104104

105105
char *tname = talloc_asprintf(NULL, "ipc/%s", arg->client_name);
106106
mp_thread_set_name(tname);
@@ -163,7 +163,7 @@ static MP_THREAD_VOID client_thread(void *p)
163163
if (fds[1].revents & (POLLIN | POLLHUP | POLLNVAL)) {
164164
while (1) {
165165
char buf[128];
166-
bstr append = { buf, 0 };
166+
bstr append = { (unsigned char *)buf, 0 };
167167

168168
ssize_t bytes = read(arg->client_fd, buf, sizeof(buf));
169169
if (bytes < 0) {

misc/bstr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ int bstrcasecmp(struct bstr str1, struct bstr str2)
4848
{
4949
int ret = 0;
5050
if (str1.len && str2.len)
51-
ret = strncasecmp(str1.start, str2.start, MPMIN(str1.len, str2.len));
51+
ret = strncasecmp((char *)str1.start, (char *)str2.start, MPMIN(str1.len, str2.len));
5252

5353
if (!ret) {
5454
if (str1.len == str2.len)
@@ -397,7 +397,7 @@ int bstr_xappend_vasprintf(void *talloc_ctx, bstr *s, const char *fmt,
397397
va_list copy;
398398
va_copy(copy, ap);
399399
size_t avail = talloc_get_size(s->start) - s->len;
400-
char *dest = s->start ? s->start + s->len : NULL;
400+
char *dest = s->start ? (char *)(s->start + s->len) : NULL;
401401
size = vsnprintf(dest, avail, fmt, copy);
402402
va_end(copy);
403403

@@ -406,7 +406,7 @@ int bstr_xappend_vasprintf(void *talloc_ctx, bstr *s, const char *fmt,
406406

407407
if (avail < 1 || size + 1 > avail) {
408408
resize_append(talloc_ctx, s, size + 1);
409-
vsnprintf(s->start + s->len, size + 1, fmt, ap);
409+
vsnprintf((char *)(s->start + s->len), size + 1, fmt, ap);
410410
}
411411
s->len += size;
412412
return size;
@@ -457,7 +457,7 @@ bool bstr_decode_hex(void *talloc_ctx, struct bstr hex, struct bstr *out)
457457
arr[len++] = (a << 4) | b;
458458
}
459459

460-
*out = (struct bstr){ .start = arr, .len = len };
460+
*out = (struct bstr){ .start = (unsigned char *)arr, .len = len };
461461
return true;
462462
}
463463

misc/charset_conv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static const char *mp_uchardet(void *talloc_ctx, struct mp_log *log, bstr buf)
6969
uchardet_t det = uchardet_new();
7070
if (!det)
7171
return NULL;
72-
if (uchardet_handle_data(det, buf.start, buf.len) != 0) {
72+
if (uchardet_handle_data(det, (char *)buf.start, buf.len) != 0) {
7373
uchardet_delete(det);
7474
return NULL;
7575
}
@@ -180,7 +180,7 @@ bstr mp_iconv_to_utf8(struct mp_log *log, bstr buf, const char *cp, int flags)
180180
size_t oleft = size - 1;
181181

182182
char *outbuf = talloc_size(NULL, osize);
183-
char *ip = buf.start;
183+
char *ip = (char *)buf.start;
184184
char *op = outbuf;
185185

186186
while (1) {
@@ -222,7 +222,7 @@ bstr mp_iconv_to_utf8(struct mp_log *log, bstr buf, const char *cp, int flags)
222222
iconv_close(icdsc);
223223

224224
outbuf[osize - oleft - 1] = 0;
225-
return (bstr){outbuf, osize - oleft - 1};
225+
return (bstr){(unsigned char *)outbuf, osize - oleft - 1};
226226

227227
failure:
228228
#endif

misc/json.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static int read_str(void *ta_parent, struct mpv_node *dst, char **src)
125125
bstr r = bstr0(str);
126126
if (!mp_append_escaped_string(ta_parent, &unescaped, &r))
127127
return -1; // broken escapes
128-
str = unescaped.start; // the function guarantees null-termination
128+
str = (char *)unescaped.start; // the function guarantees null-termination
129129
}
130130
dst->format = MPV_FORMAT_STRING;
131131
dst->u.string = str;
@@ -268,17 +268,17 @@ static void write_json_str(bstr *b, unsigned char *str)
268268
break;
269269
bstr_xappend(NULL, b, (bstr){str, cur - str});
270270
if (cur[0] == '\"') {
271-
bstr_xappend(NULL, b, (bstr){"\\\"", 2});
271+
bstr_xappend(NULL, b, (bstr){(unsigned char *)"\\\"", 2});
272272
} else if (cur[0] == '\\') {
273-
bstr_xappend(NULL, b, (bstr){"\\\\", 2});
273+
bstr_xappend(NULL, b, (bstr){(unsigned char *)"\\\\", 2});
274274
} else if (cur[0] < sizeof(special_escape) && special_escape[cur[0]]) {
275275
bstr_xappend_asprintf(NULL, b, "\\%c", special_escape[cur[0]]);
276276
} else {
277277
bstr_xappend_asprintf(NULL, b, "\\u%04x", (unsigned char)cur[0]);
278278
}
279279
str = cur + 1;
280280
}
281-
APPEND(b, str);
281+
APPEND(b, (char *)str);
282282
APPEND(b, "\"");
283283
}
284284

@@ -312,7 +312,7 @@ int json_append(bstr *b, const struct mpv_node *src, int indent)
312312
if (indent == 0)
313313
APPEND(b, src->u.string);
314314
else
315-
write_json_str(b, src->u.string);
315+
write_json_str(b, (unsigned char *)(src->u.string));
316316
return 0;
317317
case MPV_FORMAT_NODE_ARRAY:
318318
case MPV_FORMAT_NODE_MAP: {
@@ -325,7 +325,7 @@ int json_append(bstr *b, const struct mpv_node *src, int indent)
325325
APPEND(b, ",");
326326
add_indent(b, next_indent);
327327
if (is_obj) {
328-
write_json_str(b, list->keys[n]);
328+
write_json_str(b, (unsigned char *)list->keys[n]);
329329
APPEND(b, ":");
330330
}
331331
json_append(b, &list->values[n], next_indent);
@@ -342,7 +342,7 @@ static int json_append_str(char **dst, struct mpv_node *src, int indent)
342342
{
343343
bstr buffer = bstr0(*dst);
344344
int r = json_append(&buffer, src, indent);
345-
*dst = buffer.start;
345+
*dst = (char *) buffer.start;
346346
return r;
347347
}
348348

misc/path_utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ bstr mp_basename_bstr(bstr path)
6161

6262
const char *mp_basename(const char *path)
6363
{
64-
return mp_basename_bstr(bstr0(path)).start;
64+
return (char *)mp_basename_bstr(bstr0(path)).start;
6565
}
6666

6767
struct bstr mp_dirname(const char *path)

options/m_config_frontend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static int show_profile(struct m_config *config, bstr param, int depth)
110110
int l = e - list;
111111
if (!l)
112112
continue;
113-
show_profile(config, (bstr){list, e - list}, depth);
113+
show_profile(config, (bstr){(unsigned char *)list, e - list}, depth);
114114
list = e + 1;
115115
}
116116
if (list[0] != '\0')

options/m_option.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ static char **separate_input_param(const m_option_t *opt, bstr param,
14181418

14191419
char **list = talloc_array(NULL, char *, n + 2);
14201420
str = bstrdup(NULL, param);
1421-
char *ptr = str.start;
1421+
char *ptr = (char *)str.start;
14221422
n = 0;
14231423

14241424
while (1) {

0 commit comments

Comments
 (0)