penwing/savoia-surf
1
0
Fork 0
Code Issues 4 Pull requests Actions Packages Projects Releases Wiki Activity

fixed warnings

Browse source
This commit is contained in:
WanderingPenwing 2024-08-03 11:30:39 +02:00
parent 1420954ac8
commit 620a979271
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
surf.c
View file

@ -2045,7 +2045,7 @@ msgext(Client *c, char type, const Arg *a)
} }
if (send(spair[0], msg, ret, 0) != ret) if (send(spair[0], msg, ret, 0) != ret)
fprintf(stderr, "surf: error sending: %u%c%d (%d)\n", fprintf(stderr, "surf: error sending: %" PRIu64 "%c%d (%d)\n",
c->pageid, type, a->i, ret); c->pageid, type, a->i, ret);
} }

38
webext-surf.c
View file

@ -25,8 +25,8 @@ msgsurf(guint64 pageid, const char *s)
size_t sln = strlen(s); size_t sln = strlen(s);
int ret; int ret;
if ((ret = snprintf(msg, sizeof(msg), "%c%s", pageid, s)) if ((ret = snprintf(msg, sizeof(msg), "%" PRIu64 "%s", pageid, s))
>= sizeof(msg)) { >= sizeof(msg)) {
fprintf(stderr, "webext: msg: message too long: %d\n", ret); fprintf(stderr, "webext: msg: message too long: %d\n", ret);
return; return;
} }
@ -45,18 +45,18 @@ readsock(GIOChannel *s, GIOCondition c, gpointer unused)
gsize msgsz; gsize msgsz;
if (g_io_channel_read_chars(s, msg, sizeof(msg), &msgsz, &gerr) != if (g_io_channel_read_chars(s, msg, sizeof(msg), &msgsz, &gerr) !=
G_IO_STATUS_NORMAL) { G_IO_STATUS_NORMAL) {
if (gerr) { if (gerr) {
fprintf(stderr, "webext: error reading socket: %s\n", fprintf(stderr, "webext: error reading socket: %s\n",
gerr->message); gerr->message);
g_error_free(gerr); g_error_free(gerr);
} }
return TRUE; return TRUE;
} }
if (msgsz < 2) { if (msgsz < 2) {
fprintf(stderr, "webext: readsock: message too short: %d\n", fprintf(stderr, "webext: readsock: message too short: %zu\n",
msgsz); msgsz);
return TRUE; return TRUE;
} }
@ -70,17 +70,27 @@ readsock(GIOChannel *s, GIOCondition c, gpointer unused)
if (msgsz != 3) if (msgsz != 3)
return TRUE; return TRUE;
snprintf(js, sizeof(js), snprintf(js, sizeof(js),
"window.scrollBy(window.innerWidth/100*%d,0);", "window.scrollBy(window.innerWidth/100*%d,0);",
msg[2]); msg[2]);
jsc_context_evaluate(jsc, js, -1); JSCValue *h_result = jsc_context_evaluate(jsc, js, -1);
if (h_result) {
free(h_result);
} else {
fprintf(stderr, "Error evaluating JavaScript\n");
}
break; break;
case 'v': case 'v':
if (msgsz != 3) if (msgsz != 3)
return TRUE; return TRUE;
snprintf(js, sizeof(js), snprintf(js, sizeof(js),
"window.scrollBy(0,window.innerHeight/100*%d);", "window.scrollBy(0,window.innerHeight/100*%d);",
msg[2]); msg[2]);
jsc_context_evaluate(jsc, js, -1); JSCValue *v_result = jsc_context_evaluate(jsc, js, -1);
if (v_result) {
free(v_result);
} else {
fprintf(stderr, "Error evaluating JavaScript\n");
}
break; break;
} }
@ -114,7 +124,7 @@ pageusermessagereply(GObject *o, GAsyncResult *r, gpointer page)
gchansock = g_io_channel_unix_new(sock); gchansock = g_io_channel_unix_new(sock);
g_io_channel_set_encoding(gchansock, NULL, NULL); g_io_channel_set_encoding(gchansock, NULL, NULL);
g_io_channel_set_flags(gchansock, g_io_channel_get_flags(gchansock) g_io_channel_set_flags(gchansock, g_io_channel_get_flags(gchansock)
| G_IO_FLAG_NONBLOCK, NULL); | G_IO_FLAG_NONBLOCK, NULL);
g_io_channel_set_close_on_unref(gchansock, TRUE); g_io_channel_set_close_on_unref(gchansock, TRUE);
g_io_add_watch(gchansock, G_IO_IN, readsock, NULL); g_io_add_watch(gchansock, G_IO_IN, readsock, NULL);
} }
@ -134,5 +144,5 @@ webkit_web_extension_initialize(WebKitWebExtension *e)
webext = e; webext = e;
g_signal_connect(G_OBJECT(e), "page-created", g_signal_connect(G_OBJECT(e), "page-created",
G_CALLBACK(pagecreated), NULL); G_CALLBACK(pagecreated), NULL);
} }