Limpio de basura todo el codigo

[z.facultad/75.06/jacu.git] / src / jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index 5add536bdca619bef27d773bc85a548264341a05..62939f47528d0f63fa48059c5df361c466095844 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -99,9 +99,9 @@ int main(int argc, char* argv[])
                /* Comprimo */          
                FILE *fp;
                Uint32 i, j, total, k;
                /* Comprimo */          
                FILE *fp;
                Uint32 i, j, total, k;

-               char *mtf;
-               char *salida, *data;
-               char *z;
+               unsigned char *mtf;
+               unsigned char *salida, *data;
+               unsigned char *z;

                int z_len;
                
                /* Preparo el compresor huffman */
                int z_len;
                
                /* Preparo el compresor huffman */


@@ -109,8 +109,8 @@ int main(int argc, char* argv[])
                if (mflag == 1) shuff_loadmodel(shuff,staticmodel);
                
                /* Preparo el BS alocando mem para el K, el Block y su Size */
                if (mflag == 1) shuff_loadmodel(shuff,staticmodel);
                
                /* Preparo el BS alocando mem para el K, el Block y su Size */

-               data = malloc(sizeof(char)*pagesize);
-               salida = malloc(sizeof(char)*pagesize+sizeof(Uint32)*2);
+               data = malloc(sizeof(unsigned char)*pagesize);
+               salida = malloc(sizeof(unsigned char)*pagesize+sizeof(Uint32)*2);

                bs = bs_create(pagesize);
 
                /* Abrimos el archivo a comprimir y encodeamos bloques */
                bs = bs_create(pagesize);
 
                /* Abrimos el archivo a comprimir y encodeamos bloques */


@@ -130,28 +130,9 @@ int main(int argc, char* argv[])
                        /* Aplico el BlockSorting */
                        bs_solve(data, salida, bs, &k, i);
 
                        /* Aplico el BlockSorting */
                        bs_solve(data, salida, bs, &k, i);
 

-                       /*printf("BS k=%ld\n", *(Uint32 *)(salida+sizeof(Uint32)));
-                       printf("PageSize = %ld\n", *(Uint32 *)salida);
-
-                       printf("Antes de MTF = %ld [", i);
-                       {
-                               int ii;
-                               for(ii=0; ii<(i+sizeof(Uint32)); ii++)
-                                       printf("(%c)", salida[ii+sizeof(Uint32)]);
-                               printf("]\n");
-                       }*/
-                       

                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);

-/*
-                       printf("MTF Z (len=%d) = [", z_len);
-                       {
-                               int ii;
-                               for(ii=0; ii<z_len; ii++)
-                                       printf("(%c)", z[ii]);
-                               printf("]\n");
-
-                       }*/
+                       

                        /* Si me lo piden, aplico ZG. */
                        if (zflag) {
                                size_t len;
                        /* Si me lo piden, aplico ZG. */
                        if (zflag) {
                                size_t len;


@@ -195,10 +176,10 @@ int main(int argc, char* argv[])
        if (dflag == 1) { 
                /* Descomprimo */
                FILE *fp_out;
        if (dflag == 1) { 
                /* Descomprimo */
                FILE *fp_out;

-               FILE *fp_in;
+               /*FILE *fp_in;*/

                Uint32 block_size, k;
                Uint32 block_size, k;

-               char *block, *mtf, *orig;
-               char *z;
+               unsigned char *block, *mtf, *orig;
+               unsigned char *z;

                int z_len,moredata = 0,decoded = 0;
 
                /* Inicializo el descompresor */
                int z_len,moredata = 0,decoded = 0;
 
                /* Inicializo el descompresor */


@@ -213,39 +194,14 @@ int main(int argc, char* argv[])
                        moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded);
                        if (block_size > 0) {
                                moredata = shuff_decode_chunk(shuff,(char*)&z_len,sizeof(int),&decoded);                                
                        moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded);
                        if (block_size > 0) {
                                moredata = shuff_decode_chunk(shuff,(char*)&z_len,sizeof(int),&decoded);                                

-                               z = malloc(sizeof(char)*z_len);
+                               z = malloc(sizeof(unsigned char)*z_len);

                                moredata = shuff_decode_chunk(shuff,z,z_len,&decoded);                          
 
                                moredata = shuff_decode_chunk(shuff,z,z_len,&decoded);                          
 

-                               /*printf("MTF Z (len=%d) = [", z_len);
-                               {
-                                       int ii;
-                                       for(ii=0; ii<z_len; ii++)
-                                               printf("(%c)", z[ii]);
-                                       printf("]\n");
-       
-                               }*/
-                               
-                               block = malloc(block_size*sizeof(char)+sizeof(Uint32));
-                               orig = malloc(block_size*sizeof(char));
+                               block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32));
+                               orig = malloc(block_size*sizeof(unsigned char));

                                moredata = shuff_decode_chunk(shuff,block,block_size+sizeof(Uint32),&decoded);                          
 
                                moredata = shuff_decode_chunk(shuff,block,block_size+sizeof(Uint32),&decoded);                          
 

-                               /*printf("Antes MTF_inv = [");
-                               {
-                                       int ii;
-                                       for(ii=0; ii<block_size+sizeof(Uint32); ii++)
-                                               printf("(%c)", block[ii]);
-                                       printf("]\n");
-                               }*/
-                               /* Hago el MTF inverso */
-                               mtf = jacu_mtf_inv(z, block, block_size*sizeof(char)+sizeof(Uint32));
-
-                               /*printf("Luego de MTF Inv= [");
-                               {
-                                       int ii;
-                                       for(ii=0; ii<block_size+sizeof(Uint32); ii++)
-                                               printf("(%c)", mtf[ii]);
-                                       printf("]\n");
-                               }*/
+                               mtf = jacu_mtf_inv(z, block, block_size*sizeof(unsigned char)+sizeof(Uint32));

 
                                /* Luego de hacer el MTF inverso ya puedo recuperar el k */
                                memcpy(&k, mtf, sizeof(Uint32));
 
                                /* Luego de hacer el MTF inverso ya puedo recuperar el k */
                                memcpy(&k, mtf, sizeof(Uint32));


@@ -253,7 +209,7 @@ int main(int argc, char* argv[])
                                /*printf("Restored : k=%ld\n", k);*/
                                bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 
                                /*printf("Restored : k=%ld\n", k);*/
                                bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 

-                               fwrite(orig, block_size, sizeof(char), fp_out);
+                               fwrite(orig, block_size, sizeof(unsigned char), fp_out);

                                free(block);
                                free(orig);
                                free(mtf);
                                free(block);
                                free(orig);
                                free(mtf);