X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Ftests%2Fmerge_test.c;fp=src%2Fshared%2Ftests%2Fmerge_test.c;h=41020d147f0103f23bb07bd9ea0ab37a802fdf1d;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=83fc3132c3c8ec6fbe4730e372217e1ae814d3eb;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b;p=ossec-hids.git

diff --git a/src/shared/tests/merge_test.c b/src/shared/tests/merge_test.c
old mode 100755
new mode 100644
index 83fc313..41020d1
--- a/src/shared/tests/merge_test.c
+++ b/src/shared/tests/merge_test.c
@@ -1,32 +1,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+
 #include "file_op.h"
 
 
 int main(int argc, char **argv)
 {
-    if(!argv[1])
-    {
+    if (!argv[1]) {
         printf("%s [mu] <merged file> <file to merge1> <file to merge2> ..\n", argv[0]);
         exit(1);
     }
 
-    if(strcmp(argv[1], "m") == 0)
-    {
+    if (strcmp(argv[1], "m") == 0) {
         MergeFiles(argv[2], argv + 3);
-    }
-    else if(strcmp(argv[1], "u") == 0)
-    {
+    } else if (strcmp(argv[1], "u") == 0) {
         UnmergeFiles(argv[2]);
-    }
-    else
-    {
+    } else {
         printf("ERROR\n");
     }
 
-    return(0);
+    return (0);
 }
 
-
-/* EOF */