Make owned filename a pointer-to-non-const

The file handler owns the filename string, so it needs to free it. Therefore, it should not be a pointer-to-const.
Genymobile · May 24, 2019 · a41dd6c · a41dd6c
1 parent c3779d8
commit a41dd6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/src/file_handler.c b/app/src/file_handler.c
@@ -10,11 +10,11 @@
 
 struct request {
     file_handler_action_t action;
-    const char *file;
+    char *file;
 };
 
 static struct request *
-request_new(file_handler_action_t action, const char *file) {
+request_new(file_handler_action_t action, char *file) {
     struct request *req = SDL_malloc(sizeof(*req));
     if (!req) {
         return NULL;
@@ -29,7 +29,7 @@ request_free(struct request *req) {
     if (!req) {
         return;
     }
-    SDL_free((void *) req->file);
+    SDL_free(req->file);
     SDL_free(req);
 }
 
@@ -137,7 +137,7 @@ push_file(const char *serial, const char *file) {
 bool
 file_handler_request(struct file_handler *file_handler,
                      file_handler_action_t action,
-                     const char *file) {
+                     char *file) {
     bool res;
 
     // start file_handler if it's used for the first time

diff --git a/app/src/file_handler.h b/app/src/file_handler.h
@@ -46,9 +46,10 @@ file_handler_stop(struct file_handler *file_handler);
 void
 file_handler_join(struct file_handler *file_handler);
 
+// take ownership of file, and will SDL_free() it
 bool
 file_handler_request(struct file_handler *file_handler,
                      file_handler_action_t action,
-                     const char *file);
+                     char *file);
 
 #endif