refactoring: gathering some identical code in a single function

Author: gruszczy

constants.h

@@ -0,0 +1,3 @@
+/* snapshot files' extensions */
+#define FULL_SNAPSHOT_EXT "snapshot"
+#define DIFF_SNAPSHOT_EXT "diff"

layout/versions.c

@@ -29,7 +29,6 @@ int versions_init(char *repo){
 		}
 
     char **revs = NULL;
-    char *extension = NULL;
     int i = 0;
 
 	// printf("[Function: init_versions] Received repo path %s;\n", path);
@@ -39,12 +38,7 @@ int versions_init(char *repo){
         versions_init_finish(-1);
     read_layout_versions(revs[rev_count[0] - 1], NULL);
     for (i = rev_count[0] - 1; i >= 0; i--){
-    	extension = gpthext(revs[i]);
-    	if (strcmp(extension, "snapshot") == 0)
-    		snapshot_copy(revs[i], CURRENT_SNAPSHOT, data_dir);
-    	else // strcmp(extension, "diff") == 0)
-    		snapshot_append(revs[i], CURRENT_SNAPSHOT, data_dir);
-		gstrdel(extension);
+        add_snapshot(revs[i], CURRENT_SNAPSHOT, data_dir);
 		read_revision_versions(revs[i], rev_count[0] - i - 1, NULL, -1);
 	};
 	versions_init_finish(0);
@@ -71,7 +65,6 @@ int versions_init_multi(int count, char **repos){
 
 	int i = 0, j = 0, k = 0;
 	char **revs = NULL;
-	char *extension = NULL;
 	char *snapshot = NULL;
 
 	gtreenew(&version_tree);
@@ -88,12 +81,7 @@ int versions_init_multi(int count, char **repos){
 			continue;
 		};
 		for (j = rev_count[i] - 1; j >= 0; j--){
-	    	extension = gpthext(revs[j]);
-	    	if (strcmp(extension, "snapshot") == 0)
-	    		snapshot_copy(revs[j], CURRENT_SNAPSHOT, data_dir);
-	    	else // strcmp(extension, "diff") == 0)
-	    		snapshot_append(revs[j], CURRENT_SNAPSHOT, data_dir);
-			gstrdel(extension);
+            add_snapshot(revs[j], CURRENT_SNAPSHOT, data_dir);
 		    read_revision_versions(revs[j], rev_count[i] - j - 1, repo_names[i], i);
 		};
 		versions_init_multi_free_revs;

structure/full.c

@@ -31,7 +31,6 @@ int full_build(char *repo){
 		}
 
     char **revs = NULL;
-    char *extension = NULL;
     int i = 0;
 
     gtreenew(&structure_tree);
@@ -40,12 +39,7 @@ int full_build(char *repo){
     if ((rev_count[0] = gather_revisions(repo, data_dir, &revs)) == -1)
         full_build_finish(-1);
     for (i = rev_count[0] - 1; i >= 0; i--){
-    	extension = gpthext(revs[i]);
-    	if (strcmp(extension, "snapshot") == 0)
-    		snapshot_copy(revs[i], CURRENT_SNAPSHOT, data_dir);
-    	else // strcmp(extension, "diff") == 0)
-    		snapshot_append(revs[i], CURRENT_SNAPSHOT, data_dir);
-		gstrdel(extension);
+        add_snapshot(revs[i], CURRENT_SNAPSHOT, data_dir);
 		read_revision_all(NULL, revs[i], -1, rev_count[0] - i - 1);
 	};
 	full_build_finish(0);
@@ -76,7 +70,6 @@ int full_build_multi(int count, char **repo){
     int k = 0;
     char **revs = NULL;
     char *repo_dir = NULL;
-	char *extension = NULL;
 	char *snapshot = NULL;
 
     //printf("[Function: init_multi] Received %d repos;\n", count);
@@ -91,12 +84,7 @@ int full_build_multi(int count, char **repo){
 			continue;
 		};
 		for (j = rev_count[i] - 1; j >= 0; j--){
-			extension = gpthext(revs[j]);
-			if (strcmp(extension, "snapshot") == 0)
-    			snapshot_copy(revs[j], CURRENT_SNAPSHOT, data_dir);
-    		else // strcmp(extension, "diff") == 0)
-    			snapshot_append(revs[j], CURRENT_SNAPSHOT, data_dir);
-		    gstrdel(extension);
+            add_snapshot(revs[j], CURRENT_SNAPSHOT, data_dir);
 		    read_revision_all(repo_names[i], revs[j], i, rev_count[i] - j - 1);
 		};
 		full_build_multi_free_revs;

support/grdiff.c

@@ -1,4 +1,5 @@
 #include "grdiff.h"
+#include "../constants.h"
 
 // prototypes:
 
@@ -256,6 +257,23 @@ int get_revisions(char *where, int count, char **revs){
 
 }
 
+int add_snapshot(char *revision, char *target, char *directory){
+
+    char *extension = NULL;
+    int result = 0;
+
+    extension = gpthext(revision);
+    if (strcmp(extension, FULL_SNAPSHOT_EXT) == 0)
+        result = snapshot_copy(revision, target, directory);
+    else if (strcmp(extension, DIFF_SNAPSHOT_EXT) == 0)
+        result = snapshot_append(revision, target, directory);
+    else
+        result = -1;
+    gstrdel(extension);
+    return result;
+
+};
+
 int snapshot_copy(char *revision, char *target, char *directory){
 
 	char *path = NULL;

support/grdiff.h

@@ -59,7 +59,16 @@ int read_stats(struct stats *stats, FILE *file);
 int get_revisions(char *, int, char **);
 
 /*
- * copy given revision to a certain target in a given directory
+ * adds given revision to target file in a given directory
+ * 
+ * @1: revision file name to be added
+ * @2: target file name
+ * @3: directory where both files are stored
+ */
+int add_snapshot(char *, char *, char *);
+
+/*
+ * copy given revision to target file in a given directory
  * 
  * @1: revision file name to be copied
  * @2: target file name
@@ -70,7 +79,7 @@ int get_revisions(char *, int, char **);
 int snapshot_copy(char *, char *, char *);
 
 /*
- * append given revision to a certain target in a given directory
+ * append given revision to target file in a given directory
  * 
  * @1: revision file name to be appended
  * @2: target file name