Para que quede mas prolijo

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 9463b433401793f92ec978484180e3d5942e0590..59a0de9ad2b092b6ddbf3f7632605ca36f23ca8b 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -6,7 +6,7 @@
 
 typedef struct _bs_decode_t_ {
        char c;
 
 typedef struct _bs_decode_t_ {
        char c;

-       unsigned long int pos;
+       Uint32 pos;

 } t_BlockSortDecode;
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j);
 } t_BlockSortDecode;
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j);


@@ -31,7 +31,7 @@ int __compare(const void *d1, const void *d2) {
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j)
 {
 
 char es_menor(char *data, t_BlockSort *bs, int i, int j)
 {

-       unsigned long int pi, pj, k;
+       Uint32 pi, pj, k;

 
        for(k=0; k<bs->len; k++) {
                pi = (i+k)%bs->len;
 
        for(k=0; k<bs->len; k++) {
                pi = (i+k)%bs->len;


@@ -61,9 +61,9 @@ void ordenar_array(char *data, t_BlockSort *bs)
        qsort(bs->array, bs->len, sizeof(t_BlockSortData), __compare);
 }
 
        qsort(bs->array, bs->len, sizeof(t_BlockSortData), __compare);
 }
 

-void print_(char *data, unsigned long int pos, unsigned long int len)
+void print_(char *data, Uint32 pos, Uint32 len)

 {
 {

-       unsigned long int i;
+       Uint32 i;

 
        for(i=0; i<len; i++)
                printf("%c", data[(pos+i)%len]);
 
        for(i=0; i<len; i++)
                printf("%c", data[(pos+i)%len]);


@@ -72,11 +72,11 @@ void print_(char *data, unsigned long int pos, unsigned long int len)
 
 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {
 
 int generar_salida(char *data, t_BlockSort *bs, char *salida)
 {

-       unsigned long int i, k;
+       Uint32 i, k;

        char *out;
 
        /* Dejo lugar para guardar el k y el tamaño de este bloque */
        char *out;
 
        /* Dejo lugar para guardar el k y el tamaño de este bloque */

-       out = salida + sizeof(unsigned long int)*2;
+       out = salida + sizeof(Uint32)*2;

 
        k=-1;
        for(i=0; i<bs->len; i++) {
 
        k=-1;
        for(i=0; i<bs->len; i++) {


@@ -87,7 +87,7 @@ int generar_salida(char *data, t_BlockSort *bs, char *salida)
        return k;
 }
 
        return k;
 }
 

-void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsigned int leido)
+void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido)

 {
        unsigned int l;
        l = bs->len;
 {
        unsigned int l;
        l = bs->len;


@@ -100,15 +100,15 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsign
        (*k) = generar_salida(in, bs, out);
 
        /* Guardo el k y el tamaño en el array */
        (*k) = generar_salida(in, bs, out);
 
        /* Guardo el k y el tamaño en el array */

-       memcpy(out, &leido, sizeof(unsigned long int));
-       memcpy(out+sizeof(unsigned long int), k, sizeof(unsigned long int));
+       memcpy(out, &leido, sizeof(Uint32));
+       memcpy(out+sizeof(Uint32), k, sizeof(Uint32));

 
        bs->len = l;
 }
 
 
        bs->len = l;
 }
 

-void bs_restore(char *dst, char *c, unsigned long int k, unsigned long int len)
+void bs_restore(char *dst, char *c, Uint32 k, Uint32 len)

 {
 {

-       unsigned long int i, current;
+       Uint32 i, current;

        t_BlockSortDecode *in;
 
        in = malloc(sizeof(t_BlockSortDecode)*len);
        t_BlockSortDecode *in;
 
        in = malloc(sizeof(t_BlockSortDecode)*len);


@@ -129,7 +129,7 @@ void bs_restore(char *dst, char *c, unsigned long int k, unsigned long int len)
        free(in);
 }
 
        free(in);
 }
 

-t_BlockSort *bs_create(unsigned long int len)
+t_BlockSort *bs_create(Uint32 len)

 {
        t_BlockSort *tmp;
 
 {
        t_BlockSort *tmp;
 

diff --git a/src/blocksorting/bs.h b/src/blocksorting/bs.h
index 5097d6cc928517cd514cb41b8ef1277a09e65dd7..9efc1e5ba02179e03527f18c60729027407990e6 100644 (file)
--- a/src/blocksorting/bs.h
+++ b/src/blocksorting/bs.h
@@ -6,11 +6,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 

+typedef unsigned long int Uint32;
+

 typedef struct _bs_t_ t_BlockSort;
 
 typedef struct _bs_data_t_ {
 typedef struct _bs_t_ t_BlockSort;
 
 typedef struct _bs_data_t_ {

-       unsigned long int pos_inicial;
-       unsigned long int pos_final;
+       Uint32 pos_inicial;
+       Uint32 pos_final;

        char ord; /* indica si esta ordenada */
 
        /* Guardo el puntero al padre */
        char ord; /* indica si esta ordenada */
 
        /* Guardo el puntero al padre */


@@ -20,14 +22,15 @@ typedef struct _bs_data_t_ {
 struct _bs_t_ {
        char *data;
        t_BlockSortData *array;
 struct _bs_t_ {
        char *data;
        t_BlockSortData *array;

-       unsigned long int len;
+       Uint32 len;

 };
 
 };
 

+

 /** Inicializa un BlockSorting
  *
  *  \param len Tamaño de página a utilizar
  */
 /** Inicializa un BlockSorting
  *
  *  \param len Tamaño de página a utilizar
  */

-t_BlockSort *bs_create(unsigned long int len);
+t_BlockSort *bs_create(Uint32 len);

 
 /** Libera un BlockSorting
  *
 
 /** Libera un BlockSorting
  *


@@ -42,7 +45,7 @@ void bs_destroy(t_BlockSort *bs);
  *  \param k Puntero donde guardar la posicion del array original.
  *  \oaram leido Tamaño de in (por si el tamaño de in es menor al de la pagina).
  */
  *  \param k Puntero donde guardar la posicion del array original.
  *  \oaram leido Tamaño de in (por si el tamaño de in es menor al de la pagina).
  */

-void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsigned int leido);
+void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido);

 
 /** Obtiene el array original a partir de dst y k
  *
 
 /** Obtiene el array original a partir de dst y k
  *


@@ -51,7 +54,7 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, unsigned long int *k, unsign
  *  \param k Valor retornado por bs_solve.
  *  \param len Tamaño de c
  */
  *  \param k Valor retornado por bs_solve.
  *  \param len Tamaño de c
  */

-void bs_restore(char *dst, char *c, unsigned long int k, unsigned long int len);
+void bs_restore(char *dst, char *c, Uint32 k, Uint32 len);

 
 #endif
 
 
 #endif