projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new upstream release (3.3.0); modify package compatibility for Stretch
[ossec-hids.git]
/
src
/
shared
/
tests
/
merge_test.c
diff --git
a/src/shared/tests/merge_test.c
b/src/shared/tests/merge_test.c
old mode 100755
(executable)
new mode 100644
(file)
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 <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+
#include "file_op.h"
int main(int argc, char **argv)
{
#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);
}
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);
MergeFiles(argv[2], argv + 3);
- }
- else if(strcmp(argv[1], "u") == 0)
- {
+ } else if (strcmp(argv[1], "u") == 0) {
UnmergeFiles(argv[2]);
UnmergeFiles(argv[2]);
- }
- else
- {
+ } else {
printf("ERROR\n");
}
printf("ERROR\n");
}
- return(0);
+ return (0);
}
}
-
-/* EOF */