Change alloc names, add more equates

Author: mateoconlechuga

CEdev/examples/library_examples/fileio/demo_3/bin/FILEIO3.8xp

@@ -13,7 +13,7 @@
 /* Shared library headers - depends on which ones you wish to use */
 #include <lib/ce/fileioc.h>
 
-/* Some common function prototypes. Maybe in the future these functions will become a library */
+/* Some function prototypes. Maybe in the future these functions will become a library */
 cplx_t Int24ToCplx(int real, int imag);
 cplx_t FloatToCplx(float real, float imag);
 cplx_t RealToCplx(real_t real, real_t imag);
@@ -40,23 +40,23 @@ void main(void) {
 	ti_SetVar(TI_REAL_TYPE, ti_A, &my_real);
 
 	/* Store the equation "2+2" into the Y1 variable */
-	my_equ = ti_AllocEqu(3);
+	my_equ = ti_MallocEqu(3);
 	my_equ->data[0] = '2';
 	my_equ->data[1] = tAdd;
 	my_equ->data[2] = '2';
 	ti_SetVar(TI_EQU_TYPE, ti_Y1, my_equ);
 	free(my_equ);
 
 	/* Store the list {1.5,2.5,3.5} to L1 */
-	my_list = ti_AllocList(3);
+	my_list = ti_MallocList(3);
 	my_list->items[0] = real_1_5;
 	my_list->items[1] = real_2_5;
 	my_list->items[2] = real_3_5;
 	ti_SetVar(TI_REAL_LIST_TYPE, ti_L1, my_list);
 	free(my_list);
 
 	/* Store the matrix [[2.5,2.5]] to Ans */
-	my_matrix = ti_AllocMatrix(1,2);
+	my_matrix = ti_MallocMatrix(1,2);
 	matrix_element(my_matrix, 0, 0) = real_2_5;
 	matrix_element(my_matrix, 0, 1) = real_2_5;
 	ti_SetVar(TI_MATRIX_TYPE, ti_Ans, my_matrix);

CEdev/examples/library_examples/fileio/demo_3/src/main.c

@@ -34,7 +34,7 @@ void main(void) {
 		return;
 
 	prime_factors((unsigned)in);
-	list_out = ti_AllocList(total_primes);
+	list_out = ti_MallocList(total_primes);
 
 	for(i=0; i<total_primes; i++) {
 		list_out->items[i] = os_Int24ToReal(primes[i]);

CEdev/examples/library_examples/fileio/demo_4/src/main.c

@@ -249,42 +249,42 @@ uint8_t ti_RclVar(const uint8_t var_type, const char *var_name, void **data_stru
 /**
  * Allocates space for a real variable
  */
-#define ti_AllocReal() ((real_t*)malloc(sizeof(real_t)))
+#define ti_MallocReal() ((real_t*)malloc(sizeof(real_t)))
 
 /**
  * Allocates space for a complex variable
  */
-#define ti_AllocCplx() ((cplx_t*)malloc(sizeof(cplx_t)))
+#define ti_MallocCplx() ((cplx_t*)malloc(sizeof(cplx_t)))
 
 /**
  * Allocates space for a string variable
  */
-string_t *ti_CustomAllocString(unsigned len, void (*malloc_routine)(size_t));
-#define ti_AllocString(len) ti_CustomAllocString(len, (void*)malloc)
+string_t *ti_AllocString(unsigned len, void (*malloc_routine)(size_t));
+#define ti_MallocString(len) ti_AllocString(len, (void*)malloc)
 
 /**
  * Allocates space for a list variable
  */
-list_t *ti_CustomAllocList(unsigned dim, void (*malloc_routine)(size_t));
-#define ti_AllocList(dim) ti_CustomAllocList(dim, (void*)malloc)
+list_t *ti_AllocList(unsigned dim, void (*malloc_routine)(size_t));
+#define ti_MallocList(dim) ti_AllocList(dim, (void*)malloc)
 
 /**
  * Allocates space for a matrix variable
  */
-matrix_t *ti_CustomAllocMatrix(uint8_t rows, uint8_t cols, void (*malloc_routine)(size_t));
-#define ti_AllocMatrix(rows, cols) ti_CustomAllocMatrix(rows, cols, (void*)malloc)
+matrix_t *ti_AllocMatrix(uint8_t rows, uint8_t cols, void (*malloc_routine)(size_t));
+#define ti_MallocMatrix(rows, cols) ti_AllocMatrix(rows, cols, (void*)malloc)
 
 /**
  * Allocates space for a complex list variable
  */
-cplx_list_t *ti_CustomAllocCplxList(unsigned dim, void (*malloc_routine)(size_t));
-#define ti_AllocCplxList(dim) ti_CustomAllocCplxList(dim, (void*)malloc)
+cplx_list_t *ti_AllocCplxList(unsigned dim, void (*malloc_routine)(size_t));
+#define ti_MallocCplxList(dim) ti_AllocCplxList(dim, (void*)malloc)
 
 /**
  * Allocates space for an equation variable
  */
-equ_t *ti_CustomAllocEqu(unsigned len, void (*malloc_routine)(size_t));
-#define ti_AllocEqu(len) ti_CustomAllocEqu(len, (void*)malloc)
+equ_t *ti_AllocEqu(unsigned len, void (*malloc_routine)(size_t));
+#define ti_MallocEqu(len) ti_AllocEqu(len, (void*)malloc)
 
 /**
  * Some more definitions using Ans

CEdev/include/lib/ce/fileioc.h

@@ -67,6 +67,7 @@ typedef struct gfx_point {
  * otherwise it will not be linked correctly
  */
 gfx_image_t *gfx_AllocSprite(uint8_t width, uint8_t height, void (*malloc_routine)(size_t));
+#define gfx_MallocSprite(width, height) gfx_AllocSprite(uint8_t width, uint8_t height, (void*)malloc)
 
 /**
  * This routine should be used globally as it uses the BSS