X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/92acf059b083a5874172215f13c94c4071536b22..66f873a3de4adb65bbad6fb09cd57272216d332f:/src/mtf/mtf.c?ds=sidebyside

diff --git a/src/mtf/mtf.c b/src/mtf/mtf.c
index 6326b5e..5bf5b39 100644
--- a/src/mtf/mtf.c
+++ b/src/mtf/mtf.c
@@ -3,7 +3,7 @@
 /****privadas*****/
 int no_pertenece(char *z, char c, int len);
 
-void pop_front(char *z, int pos);
+void pop_front(char *z, unsigned int pos);
 
 int get_pos(char *z, int len, char c);
 /****fin privadas******/
@@ -16,42 +16,41 @@ void print_z(char *z, int len)
 	fprintf(stderr, "\n");
 }
 
-char *jacu_mtf(char *datos, int len, char **_z, int *z_len)
+unsigned char *jacu_mtf(unsigned char *datos, int len, unsigned char **_z, int *z_len)
 {
-	char *z;
-	char *pos;
+	unsigned char *z;
+	unsigned char *pos;
 	int i, size;
 	
-	pos = (char *)malloc(len*sizeof(char));
+	pos = (unsigned char *)malloc(len*sizeof(unsigned char));
 	z = jacu_buscar_z(datos, len, &size);
-	(*_z) = jacu_buscar_z(datos, len, &size);
-
+	*_z = (unsigned char*)malloc(size*sizeof(unsigned char));
+	memcpy(*_z, z, size*sizeof(unsigned char));
 	for(i=0; i<len; i++){
 		pos[i] = get_pos(z, size, datos[i]);
-		printf("pos de %c = %d\n", datos[i], pos[i]);
 		if (pos[i] != 0) 
 			pop_front(z, pos[i]);
 	}
-
-	/*(*_z) = z;*/
 	(*z_len) = size;
+	free(z);
 	return pos;
 }
 
-char *jacu_mtf_inv(char *z, char *pos, int len)
+unsigned char *jacu_mtf_inv(unsigned char *z, unsigned char *pos, int len)
 {
 	char *datos;
 	int i;
 	
 	datos = (char*)malloc(sizeof(char)*len);
 	for(i=0; i<len; i++){
-		datos[i] = z[(size_t)pos[i]];
-		pop_front(z, pos[i]);
+		datos[i] = z[(unsigned int)pos[i]];
+		if (pos[i] != 0)
+			pop_front(z, (unsigned int)pos[i]);
 	}
 	return datos;
 }
 
-char *jacu_buscar_z(char* datos, int len, int *size)
+unsigned char *jacu_buscar_z(unsigned char* datos, int len, int *size)
 {
 	char *z;
 	int i, j=0;
@@ -73,18 +72,19 @@ int no_pertenece(char *z, char c, int len)
 {
 	int i;
 	
-	/* XXX Z NO TIENE 255 POSICIONES XXX */
 	for(i=0; i<len; i++)
 		if (z[i] == c)
 			return 0;
 	return -1;
 }
 			
-void pop_front(char *z, int pos)
+void pop_front(char *z, unsigned int pos)
 {
 	char aux;
 	int i=0;
-	
+
+	if (pos > 255) printf("pos > = %u\n", pos);
+	if (pos < 0u) printf("pos < = %d\n", pos);
 	aux = z[pos];
 	for(i=pos; i>0; i--)
 		z[i]=z[i-1];