summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--riscos/about.c4
-rw-r--r--riscos/jpeg.c4
-rw-r--r--riscos/window.c30
3 files changed, 21 insertions, 17 deletions
diff --git a/riscos/about.c b/riscos/about.c
index 1560c6306..db28a1c32 100644
--- a/riscos/about.c
+++ b/riscos/about.c
@@ -177,12 +177,14 @@ void about_create(void) {
continue;
}
else {
+ void *name;
+
/* Type 3: image file with name xxwwwwhhhh */
/* get actual file name */
sprintf(var, "%2.2d*", j);
LOG(("var: %s", var));
- void *name = (void*)xcalloc((unsigned int)20, sizeof(char));
+ name = (void*)xcalloc((unsigned int)20, sizeof(char));
e = xosgbpb_dir_entries(val, (osgbpb_string_list*)name,
1, 0, 255, var, NULL, NULL);
diff --git a/riscos/jpeg.c b/riscos/jpeg.c
index 086218e17..9e49451a9 100644
--- a/riscos/jpeg.c
+++ b/riscos/jpeg.c
@@ -189,12 +189,12 @@ int nsjpeg_convert(struct content *c, unsigned int width, unsigned int height)
LOG(("creating sprite area"));
{
+ struct osspriteop_header *spr;
unsigned int abw = ((c->width + 3) &~ 3u) * c->height; /* sprite */
/* nBytes = spr + msk + spr ctrl blk + area ctrl blk + palette */
unsigned int nBytes = abw*2 + 44 + 16 /*+ 256*8*/; /* 8bpp */
c->data.jpeg.sprite_area = xcalloc(1, nBytes);
- struct osspriteop_header *spr = (osspriteop_header*)
- (c->data.jpeg.sprite_area + 1);
+ spr = (osspriteop_header*) (c->data.jpeg.sprite_area + 1);
/* area control block */
c->data.jpeg.sprite_area->size = nBytes;
diff --git a/riscos/window.c b/riscos/window.c
index 540f7000a..42d5ffcc9 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -736,20 +736,22 @@ bool ro_gui_window_keypress(gui_window *g, int key, bool toolbar)
case wimp_KEY_RETURN:
if (!toolbar)
break;
- char *url = xcalloc(1, 10 + strlen(g->url));
- char *url2;
- if (g->url[strspn(g->url, "abcdefghijklmnopqrstuvwxyz")] != ':') {
- strcpy(url, "http://");
- strcpy(url + 7, g->url);
- } else {
- strcpy(url, g->url);
- }
- url2 = url_join(url, 0);
- free(url);
- if (url2) {
- gui_window_set_url(g, url2);
- browser_window_open_location(g->data.browser.bw, url2);
- free(url2);
+ else {
+ char *url = xcalloc(1, 10 + strlen(g->url));
+ char *url2;
+ if (g->url[strspn(g->url, "abcdefghijklmnopqrstuvwxyz")] != ':') {
+ strcpy(url, "http://");
+ strcpy(url + 7, g->url);
+ } else {
+ strcpy(url, g->url);
+ }
+ url2 = url_join(url, 0);
+ free(url);
+ if (url2) {
+ gui_window_set_url(g, url2);
+ browser_window_open_location(g->data.browser.bw, url2);
+ free(url2);
+ }
}
return true;