mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-03 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

explicitly cast -1 to size_t, support static_assert on pre-c11

Browse source
This commit is contained in:
Wirtos_new 2021-06-17 14:16:09 +03:00
commit 2088adcdc1
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/cli.c
View file

@ -10,6 +10,10 @@
#include "util/log.h" #include "util/log.h"
#include "util/str_util.h" #include "util/str_util.h"
#ifndef static_assert
#define static_assert(x, msg) (void) sizeof(struct {int a[(x) ? 1 : -1]})
#endif
void void
scrcpy_print_usage(const char *arg0) { scrcpy_print_usage(const char *arg0) {
fprintf(stderr, fprintf(stderr,

6
app/src/receiver.c
View file

@ -47,7 +47,7 @@ process_msgs(const unsigned char *buf, size_t len) {
for (;;) { for (;;) {
struct device_msg msg; struct device_msg msg;
size_t r = device_msg_deserialize(&buf[head], len - head, &msg); size_t r = device_msg_deserialize(&buf[head], len - head, &msg);
if (r == -1) { if (r == (size_t)-1) {
return -1; return -1;
} }
if (r == 0) { if (r == 0) {
@ -76,14 +76,14 @@ run_receiver(void *data) {
assert(head < DEVICE_MSG_MAX_SIZE); assert(head < DEVICE_MSG_MAX_SIZE);
size_t r = net_recv(receiver->control_socket, buf + head, size_t r = net_recv(receiver->control_socket, buf + head,
DEVICE_MSG_MAX_SIZE - head); DEVICE_MSG_MAX_SIZE - head);
if (!r || r == -1) { if (!r || r == (size_t)-1) {
LOGD("Receiver stopped"); LOGD("Receiver stopped");
break; break;
} }
head += r; head += r;
size_t consumed = process_msgs(buf, head); size_t consumed = process_msgs(buf, head);
if (consumed == -1) { if (consumed == (size_t)-1) {
// an error occurred // an error occurred
break; break;
} }

2
app/src/stream.c
View file

@ -51,7 +51,7 @@ stream_recv_packet(struct stream *stream, AVPacket *packet) {
} }
r = net_recv_all(stream->socket, packet->data, len); r = net_recv_all(stream->socket, packet->data, len);
if (r == -1 || ((uint32_t) r) < len) { if (r == (size_t)-1 || ((uint32_t) r) < len) {
av_packet_unref(packet); av_packet_unref(packet);
return false; return false;
} }

2
app/src/sys/unix/command.c
View file

@ -156,7 +156,7 @@ get_executable_path(void) {
#ifdef __linux__ #ifdef __linux__
char buf[PATH_MAX + 1]; // +1 for the null byte char buf[PATH_MAX + 1]; // +1 for the null byte
size_t len = readlink("/proc/self/exe", buf, PATH_MAX); size_t len = readlink("/proc/self/exe", buf, PATH_MAX);
if (len == -1) { if (len == (size_t)-1) {
perror("readlink"); perror("readlink");
return NULL; return NULL;
} }

2
app/src/util/net.c
View file

@ -103,7 +103,7 @@ net_send_all(socket_t socket, const void *buf, size_t len) {
size_t w = 0; size_t w = 0;
while (len > 0) { while (len > 0) {
w = send(socket, buf, len, 0); w = send(socket, buf, len, 0);
if (w == -1) { if (w == (size_t)-1) {
return -1; return -1;
} }
len -= w; len -= w;