Merge pull request #1492 from majek:err_typo_in_netstack_tests

PiperOrigin-RevId: 290840370

3 files changed, 34 insertions, 34 deletions

diff --git a/test/syscalls/linux/rseq/critical.h b/test/syscalls/linux/rseq/critical.h
index ac987a25e..238143fd0 100644
--- a/test/syscalls/linux/rseq/critical.h
+++ b/test/syscalls/linux/rseq/critical.h
@@ -18,7 +18,7 @@
 #include "test/syscalls/linux/rseq/types.h"
 #include "test/syscalls/linux/rseq/uapi.h"
 
-constexpr uint32_t kRseqSignature = 0x90909090;
+constexpr uint32 kRseqSignature = 0x90909090;
 
 extern "C" {
 
diff --git a/test/syscalls/linux/rseq/rseq.cc b/test/syscalls/linux/rseq/rseq.cc
index f036db26d..4fe7c5ecf 100644
--- a/test/syscalls/linux/rseq/rseq.cc
+++ b/test/syscalls/linux/rseq/rseq.cc
@@ -49,7 +49,7 @@ int strcmp(const char* s1, const char* s2) {
   return static_cast<int>(*p1) - static_cast<int>(*p2);
 }
 
-int sys_rseq(struct rseq* rseq, uint32_t rseq_len, int flags, uint32_t sig) {
+int sys_rseq(struct rseq* rseq, uint32 rseq_len, int flags, uint32 sig) {
   return raw_syscall(kRseqSyscall, rseq, rseq_len, flags, sig);
 }
 
@@ -176,10 +176,10 @@ int TestAbort() {
   struct rseq_cs cs = {};
   cs.version = 0;
   cs.flags = 0;
-  cs.start_ip = reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.post_commit_offset = reinterpret_cast<uint64_t>(&rseq_loop_post_commit) -
-                          reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.abort_ip = reinterpret_cast<uint64_t>(&rseq_loop_abort);
+  cs.start_ip = reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.post_commit_offset = reinterpret_cast<uint64>(&rseq_loop_post_commit) -
+                          reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.abort_ip = reinterpret_cast<uint64>(&rseq_loop_abort);
 
   // Loops until abort. If this returns then abort occurred.
   rseq_loop(&r, &cs);
@@ -198,10 +198,10 @@ int TestAbortBefore() {
   struct rseq_cs cs = {};
   cs.version = 0;
   cs.flags = 0;
-  cs.start_ip = reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.post_commit_offset = reinterpret_cast<uint64_t>(&rseq_loop_post_commit) -
-                          reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.abort_ip = reinterpret_cast<uint64_t>(&rseq_loop_early_abort);
+  cs.start_ip = reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.post_commit_offset = reinterpret_cast<uint64>(&rseq_loop_post_commit) -
+                          reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.abort_ip = reinterpret_cast<uint64>(&rseq_loop_early_abort);
 
   // Loops until abort. If this returns then abort occurred.
   rseq_loop(&r, &cs);
@@ -220,10 +220,10 @@ int TestAbortSignature() {
   struct rseq_cs cs = {};
   cs.version = 0;
   cs.flags = 0;
-  cs.start_ip = reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.post_commit_offset = reinterpret_cast<uint64_t>(&rseq_loop_post_commit) -
-                          reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.abort_ip = reinterpret_cast<uint64_t>(&rseq_loop_abort);
+  cs.start_ip = reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.post_commit_offset = reinterpret_cast<uint64>(&rseq_loop_post_commit) -
+                          reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.abort_ip = reinterpret_cast<uint64>(&rseq_loop_abort);
 
   // Loops until abort. This should SIGSEGV on abort.
   rseq_loop(&r, &cs);
@@ -242,10 +242,10 @@ int TestAbortPreCommit() {
   struct rseq_cs cs = {};
   cs.version = 0;
   cs.flags = 0;
-  cs.start_ip = reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.post_commit_offset = reinterpret_cast<uint64_t>(&rseq_loop_post_commit) -
-                          reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.abort_ip = reinterpret_cast<uint64_t>(&rseq_loop_pre_commit);
+  cs.start_ip = reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.post_commit_offset = reinterpret_cast<uint64>(&rseq_loop_post_commit) -
+                          reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.abort_ip = reinterpret_cast<uint64>(&rseq_loop_pre_commit);
 
   // Loops until abort. This should SIGSEGV on abort.
   rseq_loop(&r, &cs);
@@ -264,10 +264,10 @@ int TestAbortClearsCS() {
   struct rseq_cs cs = {};
   cs.version = 0;
   cs.flags = 0;
-  cs.start_ip = reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.post_commit_offset = reinterpret_cast<uint64_t>(&rseq_loop_post_commit) -
-                          reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.abort_ip = reinterpret_cast<uint64_t>(&rseq_loop_abort);
+  cs.start_ip = reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.post_commit_offset = reinterpret_cast<uint64>(&rseq_loop_post_commit) -
+                          reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.abort_ip = reinterpret_cast<uint64>(&rseq_loop_abort);
 
   // Loops until abort. If this returns then abort occurred.
   rseq_loop(&r, &cs);
@@ -290,10 +290,10 @@ int TestInvalidAbortClearsCS() {
   struct rseq_cs cs = {};
   cs.version = 0;
   cs.flags = 0;
-  cs.start_ip = reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.post_commit_offset = reinterpret_cast<uint64_t>(&rseq_loop_post_commit) -
-                          reinterpret_cast<uint64_t>(&rseq_loop_start);
-  cs.abort_ip = reinterpret_cast<uint64_t>(&rseq_loop_abort);
+  cs.start_ip = reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.post_commit_offset = reinterpret_cast<uint64>(&rseq_loop_post_commit) -
+                          reinterpret_cast<uint64>(&rseq_loop_start);
+  cs.abort_ip = reinterpret_cast<uint64>(&rseq_loop_abort);
 
   __atomic_store_n(&r.rseq_cs, &cs, __ATOMIC_RELAXED);
 
diff --git a/test/syscalls/linux/rseq/types.h b/test/syscalls/linux/rseq/types.h
index b6afe9817..7f1e0c5c2 100644
--- a/test/syscalls/linux/rseq/types.h
+++ b/test/syscalls/linux/rseq/types.h
@@ -18,14 +18,14 @@
 using size_t = __SIZE_TYPE__;
 using uintptr_t = __UINTPTR_TYPE__;
 
-using uint8_t = __UINT8_TYPE__;
-using uint16_t = __UINT16_TYPE__;
-using uint32_t = __UINT32_TYPE__;
-using uint64_t = __UINT64_TYPE__;
+using uint8 = __UINT8_TYPE__;
+using uint16 = __UINT16_TYPE__;
+using uint32 = __UINT32_TYPE__;
+using uint64 = __UINT64_TYPE__;
 
-using int8_t = __INT8_TYPE__;
-using int16_t = __INT16_TYPE__;
-using int32_t = __INT32_TYPE__;
-using int64_t = __INT64_TYPE__;
+using int8 = __INT8_TYPE__;
+using int16 = __INT16_TYPE__;
+using int32 = __INT32_TYPE__;
+using int64 = __INT64_TYPE__;
 
 #endif  // GVISOR_TEST_SYSCALLS_LINUX_RSEQ_TYPES_H_