From b7d4cab41201d9a8738520f66cfd1e4b282422ce Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Mon, 5 Dec 2022 19:27:13 +0100
Subject: [PATCH] image: Cosmetics

- Remove unused function argument in __imlib_ImageFileContextPush()
- Swap function arguments in __imlib_LoadEmbedded()
---
 src/lib/Imlib2_Loader.h               |  2 +-
 src/lib/image.c                       | 14 +++++++-------
 src/lib/image.h                       |  2 +-
 src/modules/loaders/decompress_load.c |  2 +-
 src/modules/loaders/loader_id3.c      |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/Imlib2_Loader.h b/src/lib/Imlib2_Loader.h
index 8b77165..d4de7c9 100644
--- a/src/lib/Imlib2_Loader.h
+++ b/src/lib/Imlib2_Loader.h
@@ -163,7 +163,7 @@ struct _ImlibImage {
 ImlibLoader        *__imlib_FindBestLoader(const char *file, const char *format,
                                            int for_save);
 int                 __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
-                                         const char *file, int load_data);
+                                         int load_data, const char *file);
 
 uint32_t           *__imlib_AllocateData(ImlibImage * im);
 void                __imlib_FreeData(ImlibImage * im);
diff --git a/src/lib/image.c b/src/lib/image.c
index 19668c7..e0575f8 100644
--- a/src/lib/image.c
+++ b/src/lib/image.c
@@ -148,7 +148,7 @@ __imlib_FileContextClose(ImlibImageFileInfo * fi)
 }
 
 static int
-__imlib_ImageFileContextPush(ImlibImage * im, bool load, char *file)
+__imlib_ImageFileContextPush(ImlibImage * im, char *file)
 {
    ImlibImageFileInfo *fi;
 
@@ -553,7 +553,7 @@ __imlib_LoadImage(const char *file, ImlibLoadArgs * ila)
    im->key = im_key;
    im->frame = ila->frame;
 
-   if (__imlib_ImageFileContextPush(im, true, im_file ? im_file : im->file) ||
+   if (__imlib_ImageFileContextPush(im, im_file ? im_file : im->file) ||
        __imlib_FileContextOpen(im->fi, ila->fp, ila->fdata, st.st_size))
      {
         ila->err = errno;
@@ -692,15 +692,15 @@ __imlib_LoadImageData(ImlibImage * im)
 }
 
 __EXPORT__ int
-__imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, const char *file,
-                     int load_data)
+__imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, int load_data,
+                     const char *file)
 {
    int                 rc;
 
    if (!l || !im)
-      return 0;
+      return LOAD_FAIL;
 
-   __imlib_ImageFileContextPush(im, true, strdup(file));
+   __imlib_ImageFileContextPush(im, strdup(file));
    rc = __imlib_FileContextOpen(im->fi, NULL, NULL, 0);
    if (rc)
       return LOAD_FAIL;
@@ -841,7 +841,7 @@ __imlib_SaveImage(ImlibImage * im, const char *file, ImlibLoadArgs * ila)
    if (ila->pfunc)
       __imlib_LoadCtxInit(im, &ilc, ila->pfunc, ila->pgran);
 
-   __imlib_ImageFileContextPush(im, false, strdup(file));
+   __imlib_ImageFileContextPush(im, strdup(file));
 
    /* call the saver */
    loader_ret = l->module->save(im);
diff --git a/src/lib/image.h b/src/lib/image.h
index 0c3ed0f..7462365 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -101,7 +101,7 @@ ImlibLoader        *__imlib_FindBestLoader(const char *file, const char *format,
 ImlibImage         *__imlib_CreateImage(int w, int h, uint32_t * data);
 ImlibImage         *__imlib_LoadImage(const char *file, ImlibLoadArgs * ila);
 int                 __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
-                                         const char *file, int load_data);
+                                         int load_data, const char *file);
 int                 __imlib_LoadImageData(ImlibImage * im);
 void                __imlib_DirtyImage(ImlibImage * im);
 void                __imlib_FreeImage(ImlibImage * im);
diff --git a/src/modules/loaders/decompress_load.c b/src/modules/loaders/decompress_load.c
index 10238da..53f7719 100644
--- a/src/modules/loaders/decompress_load.c
+++ b/src/modules/loaders/decompress_load.c
@@ -54,7 +54,7 @@ decompress_load(ImlibImage * im, int load_data, const char *const *pext,
    close(dest);
 
    if (res)
-      rc = __imlib_LoadEmbedded(loader, im, tmp, load_data);
+      rc = __imlib_LoadEmbedded(loader, im, load_data, tmp);
 
    unlink(tmp);
 
diff --git a/src/modules/loaders/loader_id3.c b/src/modules/loaders/loader_id3.c
index 2d0a14c..09ef4ee 100644
--- a/src/modules/loaders/loader_id3.c
+++ b/src/modules/loaders/loader_id3.c
@@ -531,7 +531,7 @@ _load(ImlibImage * im, int load_data)
              goto quit;
           }
 
-        rc = __imlib_LoadEmbedded(loader, im, tmp, load_data);
+        rc = __imlib_LoadEmbedded(loader, im, load_data, tmp);
 
         unlink(tmp);
      }
@@ -565,7 +565,7 @@ _load(ImlibImage * im, int load_data)
              goto quit;
           }
 
-        rc = __imlib_LoadEmbedded(loader, im, file, load_data);
+        rc = __imlib_LoadEmbedded(loader, im, load_data, file);
 
 #if USE_TAGS
         if (!im->loader)