fbuider cleanup

1 files changed, 8 insertions, 15 deletions

diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c
index 64bcac586..fbc0e06f4 100644
--- a/src/fbuilder/build_seccomp.c
+++ b/src/fbuilder/build_seccomp.c
@@ -20,12 +20,11 @@
 
 #include "fbuilder.h"
 
-void build_seccomp(char *fname, int fd, FILE *fp) {
+void build_seccomp(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fd);
         assert(fp);
 
-        FILE *fp2 = fdopen(fd, "r");
+        FILE *fp2 = fopen(fname, "r");
         if (!fp2) {
                 fprintf(stderr, "Error: cannot open %s\n", fname);
                 exit(1);
@@ -88,12 +87,11 @@ int inet = 0;
 int inet6 = 0;
 int netlink = 0;
 int packet = 0;
-static void process_protocol(char *fname, int fd) {
+static void process_protocol(const char *fname) {
         assert(fname);
-        assert(fd);
 
         // process trace file
-        FILE *fp = fdopen(fd, "r");
+        FILE *fp = fopen(fname, "r");
         if (!fp) {
                 fprintf(stderr, "Error: cannot open %s\n", fname);
                 exit(1);
@@ -144,13 +142,11 @@ static void process_protocol(char *fname, int fd) {
 
 
 // process fname, fname.1, fname.2, fname.3, fname.4, fname.5
-void build_protocol(char *fname, int fd, FILE *fp) {
+void build_protocol(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fd);
-        assert(fp);
 
         // run fname
-        process_protocol(fname, fd);
+        process_protocol(fname);
 
         // run all the rest
         struct stat s;
@@ -159,11 +155,8 @@ void build_protocol(char *fname, int fd, FILE *fp) {
                 char *newname;
                 if (asprintf(&newname, "%s.%d", fname, i) == -1)
                         errExit("asprintf");
-                if (stat(newname, &s) == 0) {
-                  int nfd = open(newname, O_RDONLY);
-                  process_protocol(newname, nfd);
-                  unlink(newname);
-                }
+                if (stat(newname, &s) == 0)
+                        process_protocol(newname);
                 free(newname);
         }