diff options
Diffstat (limited to 'riscos/theme.c')
-rw-r--r-- | riscos/theme.c | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/riscos/theme.c b/riscos/theme.c index 40c374704..592fa0a7c 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -366,7 +366,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) /* create a full filename */ filename = malloc(strlen(folder) + strlen(leafname) + 2); if (!filename) { - LOG(("No memory for malloc")); + LOG("No memory for malloc"); warn_user("NoMemory", 0); return false; } @@ -376,8 +376,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) error = xosfind_openinw(osfind_NO_PATH, filename, 0, &file_handle); if (error) { - LOG(("xosfind_openinw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openinw: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); free(filename); return false; @@ -392,8 +391,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) 0, &output_left); xosfind_closew(file_handle); if (error) { - LOG(("xosbgpb_read_atw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosbgpb_read_atw: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); free(filename); return false; @@ -407,7 +405,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) current = (struct theme_descriptor *)calloc(1, sizeof(struct theme_descriptor)); if (!current) { - LOG(("calloc failed")); + LOG("calloc failed"); warn_user("NoMemory", 0); free(filename); return false; @@ -525,7 +523,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) descriptor->theme = (struct theme *)calloc(1, sizeof(struct theme)); if (!descriptor->theme) { - LOG(("calloc() failed")); + LOG("calloc() failed"); warn_user("NoMemory", 0); continue; } @@ -535,8 +533,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) error = xosfile_read_stamped_no_path(descriptor->filename, &obj_type, 0, 0, &file_size, 0, 0); if (error) { - LOG(("xosfile_read_stamped_no_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_read_stamped_no_path: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); continue; } @@ -544,7 +541,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) continue; raw_data = malloc(file_size); if (!raw_data) { - LOG(("malloc() failed")); + LOG("malloc() failed"); warn_user("NoMemory", 0); continue; } @@ -552,8 +549,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) (byte *)raw_data, 0, 0, 0, 0, 0); if (error) { free(raw_data); - LOG(("xosfile_load_stamped_no_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_load_stamped_no_path: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); continue; } @@ -562,8 +558,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) error = xsquash_decompress_return_sizes(-1, &workspace_size, 0); if (error) { free(raw_data); - LOG(("xsquash_decompress_return_sizes: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xsquash_decompress_return_sizes: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } @@ -573,7 +568,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) if ((!decompressed) || (!workspace)) { free(decompressed); free(raw_data); - LOG(("malloc() failed")); + LOG("malloc() failed"); warn_user("NoMemory", 0); continue; } @@ -588,8 +583,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) free(raw_data); if (error) { free(decompressed); - LOG(("xsquash_decompress: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xsquash_decompress: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } @@ -607,8 +601,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) descriptor->theme->sprite_area, sprite_name, 16, i, 0); if (error) { - LOG(("xosspriteop_return_name: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_return_name: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } @@ -623,8 +616,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) &dimensions.x, &dimensions.y, (osbool *) 0, &mode); if (error) { - LOG(("xosspriteop_read_sprite_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } |