Skip to content

Commit f56a978

Browse files
committed
Remove some unnecessary casts
It's useful to have (int) casts where it's not obvious that the trunction will happen, but when we're assinging to an explicit `int` local variable, they're unnecessary.
1 parent 9000ee9 commit f56a978

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/record_syscall.cc‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2730,7 +2730,7 @@ static void prepare_ptrace_legacy(RecordTask* t,
27302730
TaskSyscallState& syscall_state)
27312731
{
27322732
pid_t pid = (pid_t)t->regs().arg2_signed();
2733-
int command = (int)t->regs().arg1_signed();
2733+
int command = t->regs().arg1_signed();
27342734
switch (command) {
27352735
case Arch::PTRACE_PEEKUSR: {
27362736
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
@@ -2889,7 +2889,7 @@ static Switchable prepare_ptrace(RecordTask* t,
28892889
TaskSyscallState& syscall_state) {
28902890
pid_t tid = (pid_t)t->regs().arg2_signed();
28912891
bool emulate = true;
2892-
int command = (int)t->regs().arg1_signed();
2892+
int command = t->regs().arg1_signed();
28932893
switch (non_negative_command(command)) {
28942894
case PTRACE_ATTACH: {
28952895
RecordTask* tracee = prepare_ptrace_attach(t, tid, syscall_state);
@@ -3395,7 +3395,7 @@ static Switchable prepare_ptrace(RecordTask* t,
33953395
emulate = false;
33963396
break;
33973397
}
3398-
int code = (int)t->regs().arg4();
3398+
int code = t->regs().arg4();
33993399
switch (code) {
34003400
case ARCH_GET_FS:
34013401
case ARCH_GET_GS: {
@@ -4108,7 +4108,7 @@ static Switchable maybe_emulate_proc_mem_write(RecordTask* t,
41084108
TaskSyscallState& syscall_state,
41094109
int syscallno) {
41104110
const Registers& regs = t->regs();
4111-
int fd = (int)regs.arg1_signed();
4111+
int fd = regs.arg1_signed();
41124112
Switchable switchable = t->fd_table()->will_write(t, fd);
41134113
FileMonitor* monitor = t->fd_table()->get_monitor(fd);
41144114
if (!monitor || monitor->type() != FileMonitor::ProcMem) {
@@ -4493,7 +4493,7 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
44934493
break;
44944494

44954495
case MSGCTL: {
4496-
int cmd = (int)regs.arg3_signed() & ~IPC_64;
4496+
int cmd = regs.arg3_signed() & ~IPC_64;
44974497
return prepare_msgctl<Arch>(syscall_state, cmd, 5);
44984498
}
44994499

@@ -4521,12 +4521,12 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
45214521
}
45224522

45234523
case SHMCTL: {
4524-
int cmd = (int)regs.arg3_signed() & ~IPC_64;
4524+
int cmd = regs.arg3_signed() & ~IPC_64;
45254525
return prepare_shmctl<Arch>(syscall_state, cmd, 5);
45264526
}
45274527

45284528
case SEMCTL: {
4529-
int cmd = (int)regs.arg4_signed() & ~IPC_64;
4529+
int cmd = regs.arg4_signed() & ~IPC_64;
45304530
return prepare_semctl<Arch>(t, syscall_state, (int)regs.arg2_signed(),
45314531
cmd, 5, DEREFERENCE);
45324532
}
@@ -4919,8 +4919,8 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
49194919
case Arch::copy_file_range: {
49204920
syscall_state.reg_parameter<typename Arch::loff_t>(2, IN_OUT);
49214921
syscall_state.reg_parameter<typename Arch::loff_t>(4, IN_OUT);
4922-
int in_fd = (int)regs.arg1_signed();
4923-
int out_fd = (int)regs.arg3_signed();
4922+
int in_fd = regs.arg1_signed();
4923+
int out_fd = regs.arg3_signed();
49244924
ASSERT(t, !t->fd_table()->is_monitoring(in_fd) &&
49254925
!t->fd_table()->is_monitoring(out_fd))
49264926
<< "copy_file_range for monitored fds not supported yet";
@@ -4939,8 +4939,8 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
49394939
((uint32_t)regs.arg6() & ~RR_KNOWN_PREADV2_FLAGS)) {
49404940
return reject_preadv2_pwritev2<Arch>(t, syscall_state);
49414941
}
4942-
int fd = (int)regs.arg1_signed();
4943-
int iovcnt = (int)regs.arg3_signed();
4942+
int fd = regs.arg1_signed();
4943+
int iovcnt = regs.arg3_signed();
49444944
remote_ptr<void> iovecsp_void = syscall_state.reg_parameter(
49454945
2, sizeof(typename Arch::iovec) * iovcnt, IN);
49464946
auto iovecsp = iovecsp_void.cast<typename Arch::iovec>();
@@ -5073,7 +5073,7 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
50735073
// lowering the child's nice value.
50745074
if ((int)regs.arg1_signed() == PRIO_PROCESS) {
50755075
RecordTask* target =
5076-
(int)regs.arg2_signed()
5076+
regs.arg2_signed()
50775077
? t->session().find_task((int)regs.arg2_signed())
50785078
: t;
50795079
if (target) {
@@ -5247,7 +5247,7 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
52475247
Registers r = regs;
52485248
r.set_arg1(intptr_t(-1));
52495249
t->set_regs(r);
5250-
int val = (int)regs.arg2();
5250+
int val = regs.arg2();
52515251
if (val != PR_TSC_ENABLE && val != PR_TSC_SIGSEGV) {
52525252
syscall_state.emulate_result(-EINVAL);
52535253
} else {
@@ -5373,7 +5373,7 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
53735373
Registers r = t->regs();
53745374
r.set_arg1(intptr_t(-1));
53755375
t->set_regs(r);
5376-
int val = (int)t->regs().arg2();
5376+
int val = t->regs().arg2();
53775377
t->cpuid_mode = !!val;
53785378
syscall_state.emulate_result(0);
53795379
break;
@@ -7000,7 +7000,7 @@ static string extra_expected_errno_info(RecordTask* t,
70007000
case EINVAL:
70017001
switch (t->regs().original_syscallno()) {
70027002
case Arch::ioctl: {
7003-
int request = (int)t->regs().arg2_signed();
7003+
int request = t->regs().arg2_signed();
70047004
if (request == SIOCETHTOOL) {
70057005
auto ifreq_ptr = remote_ptr<typename Arch::ifreq>(t->regs().arg3());
70067006
auto ifreq = t->read_mem(ifreq_ptr);
@@ -7023,7 +7023,7 @@ static string extra_expected_errno_info(RecordTask* t,
70237023
ss << "; unknown fcntl(" << HEX((int)t->regs().arg2_signed()) << ")";
70247024
break;
70257025
case Arch::prctl: {
7026-
int request = (int)t->regs().orig_arg1_signed();
7026+
int request = t->regs().orig_arg1_signed();
70277027
if (request == PR_SET_MM) {
70287028
ss << "; unknown prctl(PR_SET_MM, " << HEX((int)t->regs().arg2_signed()) << ")";
70297029
} else {
@@ -7644,7 +7644,7 @@ static void rec_process_syscall_arch(RecordTask* t,
76447644
case Arch::recvmmsg_time64:
76457645
case Arch::recvmmsg:
76467646
if (!t->regs().syscall_failed()) {
7647-
int msg_count = (int)t->regs().syscall_result_signed();
7647+
int msg_count = t->regs().syscall_result_signed();
76487648
auto msgs = t->read_mem(
76497649
remote_ptr<typename Arch::mmsghdr>(t->regs().arg2()), msg_count);
76507650
for (auto& m : msgs) {

0 commit comments

Comments
 (0)