1 files changed, 17 insertions, 19 deletions

diff --git a/trace-output.c b/trace-output.c
index 89b3954..14fe0f1 100644
--- a/trace-output.c
+++ b/trace-output.c
@@ -521,7 +521,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle)
 }
 
 static struct tracecmd_output *
-create_file_fd(int fd, int cpus, struct tracecmd_input *ihandle)
+create_file_fd(int fd, struct tracecmd_input *ihandle)
 {
         struct tracecmd_output *handle;
         unsigned long long endian8;
@@ -629,7 +629,7 @@ create_file_fd(int fd, int cpus, struct tracecmd_input *ihandle)
         return NULL;
 }
 
-static struct tracecmd_output *create_file(const char *output_file, int cpus,
+static struct tracecmd_output *create_file(const char *output_file,
                                            struct tracecmd_input *ihandle)
 {
         struct tracecmd_output *handle;
@@ -639,7 +639,7 @@ static struct tracecmd_output *create_file(const char *output_file, int cpus,
         if (fd < 0)
                 return NULL;
 
-        handle = create_file_fd(fd, cpus, ihandle);
+        handle = create_file_fd(fd, ihandle);
         if (!handle) {
                 close(fd);
                 unlink(output_file);
@@ -673,7 +673,7 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in
         struct tracecmd_output *handle;
         char *path;
 
-        handle = create_file(output_file, cpus, NULL);
+        handle = create_file(output_file, NULL);
         if (!handle)
                 return NULL;
 
@@ -705,9 +705,9 @@ out_free:
 int tracecmd_append_cpu_data(struct tracecmd_output *handle,
                              int cpus, char * const *cpu_data_files)
 {
-        unsigned long long *offsets = NULL;
+        off64_t *offsets = NULL;
         unsigned long long *sizes = NULL;
-        unsigned long long offset;
+        off64_t offset;
         unsigned long long endian8;
         off64_t check_size;
         char *file;
@@ -733,7 +733,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,
         if (!sizes)
                 goto out_free;
 
-        offset = lseek(handle->fd, 0, SEEK_CUR);
+        offset = lseek64(handle->fd, 0, SEEK_CUR);
 
         /* hold any extra data for data */
         offset += cpus * (16);
@@ -761,8 +761,8 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,
 
         for (i = 0; i < cpus; i++) {
                 fprintf(stderr, "offset=%llx\n", offsets[i]);
-                ret = lseek64(handle->fd, offsets[i], SEEK_SET);
-                if (ret < 0) {
+                offset = lseek64(handle->fd, offsets[i], SEEK_SET);
+                if (offset == (off64_t)-1) {
                         warning("could not seek to %lld\n", offsets[i]);
                         goto out_free;
                 }
@@ -850,7 +850,7 @@ struct tracecmd_output *tracecmd_create_file(const char *output_file,
 {
         struct tracecmd_output *handle;
 
-        handle = create_file(output_file, cpus, NULL);
+        handle = create_file(output_file, NULL);
         if (!handle)
                 return NULL;
 
@@ -860,16 +860,14 @@ struct tracecmd_output *tracecmd_create_file(const char *output_file,
         return handle;
 }
 
-struct tracecmd_output *
-tracecmd_create_init_fd(int fd, int cpus)
+struct tracecmd_output *tracecmd_create_init_fd(int fd)
 {
-        struct tracecmd_output *handle;
-
-        handle = create_file_fd(fd, cpus, NULL);
-        if (!handle)
-                return NULL;
+        return create_file_fd(fd, NULL);
+}
 
-        return handle;
+struct tracecmd_output *tracecmd_create_init_file(const char *output_file)
+{
+        return create_file(output_file, NULL);
 }
 
 /**
@@ -886,7 +884,7 @@ struct tracecmd_output *tracecmd_copy(struct tracecmd_input *ihandle,
 {
         struct tracecmd_output *handle;
 
-        handle = create_file(file, tracecmd_cpus(ihandle), ihandle);
+        handle = create_file(file, ihandle);
         if (!handle)
                 return NULL;