Merge branch 'master' of https://github.com/Soikk/DB

4 files changed, 9 insertions, 21 deletions

diff --git a/TODO b/TODO
index 8fb936d..d133a03 100644
--- a/TODO
+++ b/TODO
@@ -1 +1 @@
-Nothing lol
\ No newline at end of file
+DONE	Try to improve 'sameStr' by maybe not having to check s2[i2]
diff --git a/src/main.c b/src/main.c
index 636d0b4..ddf12ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,26 +5,16 @@ int main(){
 
 	inputBuffer *in = newInputBuffer();
 
-
-	row r = {"C:/xd", "", 0, 0};
-	printf("%s %d %d\n", r.tags, r.numTags, r.lenTags);7
-	insertTag(&r, "caca");
-	insertTag(&r, "mierda");
-	insertTag(&r, "caca ");
-	insertTag(&r, "tu");
-	printf("%s %d %d\n", r.tags, r.numTags, r.lenTags);
-
-	printf("%d\n", strInTags(r.tags, r.lenTags, ";perro", 6, ';'));
-
-	row *r2 = newRow("asa");
+	row *r = newRow("~/test/img.png");
 
 	while(1){
 
 		prompt();
 		getInput(in);
 		
-		insertTag(r2, in->buffer);
-		printf("Tags of row '%s': %s\n", r2->path, r2->tags);
+		insertTag(r, in->buffer);
+		printf("Tags of row '%s': %s\n", r->path, r->tags);
+		printf("Number of tags: %u. Length of tags: %u\n", r->numTags, r->lenTags);
 
 		/*switch(handleInput(in)){
 			case META_COMMAND_SUCCESS:
@@ -35,4 +25,4 @@ int main(){
 				break;
 		}*/
 	}
-}
\ No newline at end of file
+}
diff --git a/src/storage.c b/src/storage.c
index c9dc5d0..9b66132 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -2,7 +2,6 @@
 
 
 row *newRow(const char path[MAXPATH]){
-	printf("len: %d\n", len(path));
 	row *nr = malloc(sizeof(row));
 	memcpy(nr->path, path, len(path));
 	nr->numTags = 0;
@@ -105,7 +104,6 @@ void insertTag(row *r, char *tag){
 				i = 0;
 				break;
 			case 0:
-				printf("'%s' == '%s'\n", arr[i-1], arr[i]);
 				// The tag already exists, no need to alter anything
 				free(arr);
 				return;
@@ -168,4 +166,4 @@ void removeTag(row *r, char *tag){
 	r->tags[tagnum] = '\0';
 	r->numTags = l;
 	r->lenTags = tagnum;
-}
\ No newline at end of file
+}
diff --git a/src/str.c b/src/str.c
index 9cf5685..ef2edad 100644
--- a/src/str.c
+++ b/src/str.c
@@ -9,7 +9,7 @@ uint16_t len(const char *s){
 
 bool sameStr(const char *s1, const char *s2){
 	uint16_t i1 = 0, i2 = 0;
-	while(s1[i1] && s2[i2] && s1[i1] == s2[i2])
+	while(s1[i1] && s1[i1] == s2[i2])
 		++i1, ++i2;
 	return !s1[i1] && !s2[i2];
 }
@@ -56,4 +56,4 @@ ssize_t strInTags(const char *tags, int n, const char *ndl, int m, char sep){
 		}
 	}
 	return -1;
-}
\ No newline at end of file
+}