From d29c9620cd853d9ead31075f237f53b9e6301a52 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Tue, 25 Aug 2009 17:25:12 -0700 Subject: [PATCH] Fix seg fault on ps3 flash error Signed-off-by: Geoff Levand --- lib/log/log.h | 2 +- ui/common/ps3.c | 9 ++++----- ui/common/url.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/log/log.h b/lib/log/log.h index 2a5d375..6f44bea 100644 --- a/lib/log/log.h +++ b/lib/log/log.h @@ -3,7 +3,7 @@ #include -void pb_log(const char *fmt, ...); +void __attribute__ ((format (printf, 1, 2))) pb_log(const char *fmt, ...); void pb_log_set_stream(FILE *stream); FILE * pb_log_get_stream(void); void pb_log_always_flush(int state); diff --git a/ui/common/ps3.c b/ui/common/ps3.c index cb1c8d1..c62a10d 100644 --- a/ui/common/ps3.c +++ b/ui/common/ps3.c @@ -87,7 +87,7 @@ static int ps3_flash_open(struct ps3_flash_ctx *fc, const char *mode) result = os_area_fixed_read(&fc->header, &fc->params, fc->dev); if (result) { - pb_log("%s: os_area_fixed_read failed: %s\n", __func__); + pb_log("%s: os_area_fixed_read failed\n", __func__); goto fail; } @@ -114,7 +114,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values) result = ps3_flash_open(&fc, "r"); if (result) - goto done; + goto fail; result = os_area_db_read(&fc.db, &fc.header, fc.dev); @@ -123,7 +123,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values) if (result) { pb_log("%s: os_area_db_read failed: %s\n", __func__, strerror(errno)); - goto done; + goto fail; } sum = result = os_area_db_get(&fc.db, &id_default_item, &tmp); @@ -141,14 +141,13 @@ int ps3_flash_get_values(struct ps3_flash_values *values) if (!result) values->video_mode = (uint16_t)tmp; -done: pb_log("%s: default_item: %x\n", __func__, (unsigned int)values->default_item); pb_log("%s: timeout: %u\n", __func__, (unsigned int)values->timeout); pb_log("%s: video_mode: %u\n", __func__, (unsigned int)values->video_mode); - +fail: return (result || sum) ? -1 : 0; } diff --git a/ui/common/url.c b/ui/common/url.c index 0de0f58..544eee2 100644 --- a/ui/common/url.c +++ b/ui/common/url.c @@ -140,7 +140,7 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str) path = strchr(p, '/'); if (!path) { - pb_log("%s: parse path failed '%s'\n", p); + pb_log("%s: parse path failed '%s'\n", __func__ , p); goto fail; } -- 2.39.2