]> git.lizzy.rs Git - rust.git/commitdiff
Set some explicit return value sizes
authorDavid Cook <divergentdave@gmail.com>
Sat, 28 Mar 2020 15:58:36 +0000 (10:58 -0500)
committerDavid Cook <divergentdave@gmail.com>
Sun, 5 Apr 2020 15:35:08 +0000 (10:35 -0500)
src/shims/foreign_items/posix.rs

index 2b9e94ba11db4ba321eb4856cebb63ef719fb7cb..fbf8a3b9504fb10f1640b22a24c3ce0eb0984571 100644 (file)
@@ -272,72 +272,72 @@ fn emulate_foreign_item_by_name(
 
             "pthread_mutexattr_init" => {
                 let result = this.pthread_mutexattr_init(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutexattr_settype" => {
                 let result = this.pthread_mutexattr_settype(args[0], args[1])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutexattr_destroy" => {
                 let result = this.pthread_mutexattr_destroy(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutex_init" => {
                 let result = this.pthread_mutex_init(args[0], args[1])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutex_lock" => {
                 let result = this.pthread_mutex_lock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutex_trylock" => {
                 let result = this.pthread_mutex_trylock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutex_unlock" => {
                 let result = this.pthread_mutex_unlock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_mutex_destroy" => {
                 let result = this.pthread_mutex_destroy(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_rwlock_rdlock" => {
                 let result = this.pthread_rwlock_rdlock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_rwlock_tryrdlock" => {
                 let result = this.pthread_rwlock_tryrdlock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_rwlock_wrlock" => {
                 let result = this.pthread_rwlock_wrlock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_rwlock_trywrlock" => {
                 let result = this.pthread_rwlock_trywrlock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_rwlock_unlock" => {
                 let result = this.pthread_rwlock_unlock(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             "pthread_rwlock_destroy" => {
                 let result = this.pthread_rwlock_destroy(args[0])?;
-                this.write_scalar(Scalar::from_int(result, dest.layout.size), dest)?;
+                this.write_scalar(Scalar::from_i32(result), dest)?;
             }
 
             | "signal"