mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

inspect: factor out find_png helper function

Browse Source 
Isolate the code for looking for a PNG file among a specified list from
the icon_ubuntu implementation, and switch that function to it.

This is just code refactoring, with no behaviour changes.
This commit is contained in:
Pino Toscano
2019-02-06 15:15:08 +01:00
parent 032b8d4c72
commit 6ff95acc72
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/inspect-icon.c
View File

@@ -245,6 +245,22 @@ get_png (guestfs_h *g, const char *filename, size_t *size_r, size_t max_size)
return ret;
}
static char *
find_png (guestfs_h *g, const char **filenames, size_t *size_r, size_t max_size)
{
size_t i;
char *ret;
for (i = 0; filenames[i] != NULL; ++i) {
ret = get_png (g, filenames[i], size_r, max_size);
if (ret == NULL)
return NULL;
if (ret != NOT_FOUND)
return ret;
}
return NOT_FOUND;
}
/* Return /etc/favicon.png (or \etc\favicon.png) if it exists and if
* it has a reasonable size and format.
*/
@@ -326,17 +342,8 @@ icon_ubuntu (guestfs_h *g, size_t *size_r)
"/usr/share/help/C/ubuntu-help/figures/ubuntu-logo.png",
NULL
};
size_t i;
char *ret;
for (i = 0; icons[i] != NULL; ++i) {
ret = get_png (g, icons[i], size_r, 2048);
if (ret == NULL)
return NULL;
if (ret != NOT_FOUND)
return ret;
}
return NOT_FOUND;
return find_png (g, icons, size_r, 2048);
}
#define MAGEIA_ICON "/usr/share/icons/mageia.png"