Changeset ff29f08 for doc/papers/general/evaluation/c-bench.c

Timestamp:

May 18, 2018, 2:09:21 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

• doc/papers/general/evaluation/c-bench.c (modified) (3 diffs)

doc/papers/general/evaluation/c-bench.c

@@ -5 +5 @@
 #include "c-stack.h"
 
-char* new_char( char c ) {
-        char* q = malloc(sizeof(char)); /***/
+char * new_char( char c ) {
+        char* q = malloc( sizeof(char) ); /***/
         *q = c;
         return q;
 }
 
-short* new_short( short s ) {
-        short* q = malloc(sizeof(short)); /***/
+short * new_short( short s ) {
+        short* q = malloc( sizeof(short) ); /***/
         *q = s;
         return q;
@@ -18 +18 @@
 
 int* new_int( int i ) {
-        int* q = malloc(sizeof(int)); /***/
+        int* q = malloc( sizeof(int) ); /***/
         *q = i;
         return q;
 }
 
-void* copy_char( const void* p ) { return new_char( *(const char*)p ); } /***/
-void* copy_short( const void* p ) { return new_short( *(const short*)p ); } /***/
-void* copy_int( const void* p ) { return new_int( *(const int*)p ); } /***/
-void* copy_pair_short_char( const void* p ) { return copy_pair( p, copy_short, copy_char ); } /***/
-void free_pair_short_char( void* p ) { free_pair( p, free, free ); } /***/
+void * copy_char( const void * p ) { return new_char( *(const char*)p ); } /***/
+void * copy_short( const void * p ) { return new_short( *(const short*)p ); } /***/
+void * copy_int( const void * p ) { return new_int( *(const int*)p ); } /***/
+void * copy_pair_short_char( const void * p ) { return copy_pair( p, copy_short, copy_char ); } /***/
+void free_pair_short_char( void * p ) { free_pair( p, free, free ); } /***/
 
 int cmp_char( const void* a, const void* b ) { /***/
@@ -37 +37 @@
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char * argv[] ) {
         int maxi = 0, vali = 42;
         struct stack si = new_stack(), ti;