br0kenpixel/ZygiskNext
1
0
Fork 0
mirror of https://github.com/Dr-TSNG/ZygiskNext.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

make compiler happy

Browse Source
This commit is contained in:
5ec1cff
2023-11-04 16:39:21 +08:00
parent ac53ef11a3
commit add1c65626
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
loader/src/common/socket_utils.cpp
View File

@@ -19,12 +19,12 @@ namespace socket_utils {
read_sz += ret;
} while (read_sz != count && ret != 0);
if (read_sz != count) {
PLOGE("read (%d != %d)", count, read_sz);
PLOGE("read (%zu != %zu)", count, read_sz);
}
return read_sz;
}
ssize_t xwrite(int fd, const void* buf, size_t count) {
size_t xwrite(int fd, const void* buf, size_t count) {
size_t write_sz = 0;
ssize_t ret;
do {
@@ -32,12 +32,12 @@ namespace socket_utils {
if (ret < 0) {
if (errno == EINTR) continue;
PLOGE("write");
return ret;
return write_sz;
}
write_sz += ret;
} while (write_sz != count && ret != 0);
if (write_sz != count) {
PLOGE("write (%d != %d)", count, write_sz);
PLOGE("write (%zu != %zu)", count, write_sz);
}
return write_sz;
}

2
loader/src/include/socket_utils.h
View File

@@ -9,7 +9,7 @@ namespace socket_utils {
ssize_t xread(int fd, void *buf, size_t count);
ssize_t xwrite(int fd, const void *buf, size_t count);
size_t xwrite(int fd, const void *buf, size_t count);
uint8_t read_u8(int fd);

3
zygiskd/src/root_impl/kernelsu.rs
View File

@@ -23,10 +23,11 @@ pub fn get_kernel_su() -> Option<Version> {
0,
)
};
const MAX_OLD_VERSION: i32 = MIN_KSU_VERSION - 1;
match version {
0 => None,
MIN_KSU_VERSION..=MAX_KSU_VERSION => Some(Version::Supported),
1..=MIN_KSU_VERSION => Some(Version::TooOld),
1..=MAX_OLD_VERSION => Some(Version::TooOld),
_ => Some(Version::Abnormal),
}
}

4
zygiskd/src/watchdog.rs
View File

@@ -3,8 +3,8 @@ use anyhow::{bail, Result};
use std::fs;
use std::io::{BufRead, BufReader, Write};
use std::time::Duration;
use futures::{FutureExt, join, pin_mut};
use futures::future::{Fuse, FusedFuture};
use futures::{FutureExt, pin_mut};
use futures::future::{Fuse};
use log::{debug, error, info};
use rustix::mount::mount_bind;
use rustix::process::{getgid, getuid};