Changeset 656 for trunk/user/sort/sort.c

Timestamp:

Dec 6, 2019, 12:07:51 PM (4 years ago)

Author:

alain

Message:

Fix several bugs in the FATFS and in the VFS,
related to the creation of big files requiring
more than 4 Kbytes (one cluster) on device.

File:

• trunk/user/sort/sort.c (modified) (4 diffs)

trunk/user/sort/sort.c

@@ -153 +153 @@
 }  // end merge()
 
-///////////////////////////////////////////////
-void sort( pthread_parallel_work_args_t * ptr )
+///////////////////////////////
+void * sort( void * arguments )
 {
     unsigned int        i;
@@ -161 +161 @@
 
     // get arguments
+    pthread_parallel_work_args_t * ptr = (pthread_parallel_work_args_t *)arguments;
+
     unsigned int        tid            = ptr->tid;
     pthread_barrier_t * parent_barrier = ptr->barrier;
@@ -237 +239 @@
     pthread_exit( NULL );
 
+    return NULL;
+
 } // end sort()
 
 
-/////////////////
-void main( void )
+////////////////
+int main( void )
 {
     int                    error;
@@ -452 +456 @@
     exit( 0 );
 
+    return 0;
+
 }  // end main()