diff options
-rw-r--r-- | apps/plugins/zxbox/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/misc.h | 38 | ||||
-rw-r--r-- | apps/plugins/zxbox/snapshot.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/spconf.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/spkey.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/spmain.c | 6 | ||||
-rw-r--r-- | apps/plugins/zxbox/spsound.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/sptape.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxmisc.c (renamed from apps/plugins/zxbox/misc.c) | 2 |
9 files changed, 15 insertions, 53 deletions
diff --git a/apps/plugins/zxbox/SOURCES b/apps/plugins/zxbox/SOURCES index af5cc7aba0..ae0307135f 100644 --- a/apps/plugins/zxbox/SOURCES +++ b/apps/plugins/zxbox/SOURCES | |||
@@ -3,7 +3,7 @@ helpers.c | |||
3 | interf.c | 3 | interf.c |
4 | keynames.c | 4 | keynames.c |
5 | loadim.c | 5 | loadim.c |
6 | misc.c | 6 | zxmisc.c |
7 | rom_imag.c | 7 | rom_imag.c |
8 | snapshot.c | 8 | snapshot.c |
9 | spconf.c | 9 | spconf.c |
diff --git a/apps/plugins/zxbox/misc.h b/apps/plugins/zxbox/misc.h deleted file mode 100644 index 2dc9f60105..0000000000 --- a/apps/plugins/zxbox/misc.h +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1996-1998 Szeredi Miklos | ||
3 | * Email: mszeredi@inf.bme.hu | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; either version 2 of the License, or | ||
8 | * (at your option) any later version. See the file COPYING. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
18 | * | ||
19 | */ | ||
20 | |||
21 | #ifndef MISC_H | ||
22 | #define MISC_H | ||
23 | |||
24 | #include <sys/types.h> | ||
25 | |||
26 | extern char *get_base_name(char *fname); | ||
27 | extern int check_ext(const char *filename, const char *ext); | ||
28 | extern void add_extension(char *filename, const char *ext); | ||
29 | extern int file_exist(const char *filename); | ||
30 | extern int try_extension(char *filename, const char *ext); | ||
31 | extern char *spif_get_tape_fileinfo(int *startp, int *nump); | ||
32 | extern void *malloc_err(size_t size); | ||
33 | extern char *make_string(char *ostr, const char *nstr); | ||
34 | extern void free_string(char *ostr); | ||
35 | |||
36 | extern int mis_strcasecmp(const char *s1, const char *s2); | ||
37 | |||
38 | #endif /* MISC_H */ | ||
diff --git a/apps/plugins/zxbox/snapshot.c b/apps/plugins/zxbox/snapshot.c index 5528b710c2..d693d1f6b8 100644 --- a/apps/plugins/zxbox/snapshot.c +++ b/apps/plugins/zxbox/snapshot.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "misc.h" | 21 | #include "zxmisc.h" |
22 | #include "helpers.h" | 22 | #include "helpers.h" |
23 | #include "spperif.h" | 23 | #include "spperif.h" |
24 | #include "z80.h" | 24 | #include "z80.h" |
diff --git a/apps/plugins/zxbox/spconf.c b/apps/plugins/zxbox/spconf.c index 952b3c4c12..d316ad0fbf 100644 --- a/apps/plugins/zxbox/spconf.c +++ b/apps/plugins/zxbox/spconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -17,7 +17,7 @@ | |||
17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | #include "misc.h" | 20 | #include "zxmisc.h" |
21 | #include "spconf_p.h" | 21 | #include "spconf_p.h" |
22 | #include "interf.h" | 22 | #include "interf.h" |
23 | #include "spscr_p.h" | 23 | #include "spscr_p.h" |
diff --git a/apps/plugins/zxbox/spkey.c b/apps/plugins/zxbox/spkey.c index fff2737776..a21aed6af2 100644 --- a/apps/plugins/zxbox/spkey.c +++ b/apps/plugins/zxbox/spkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* #define DEBUG_KEYS */ | 21 | /* #define DEBUG_KEYS */ |
22 | #include "misc.h" | 22 | #include "zxmisc.h" |
23 | 23 | ||
24 | #include "spkey.h" | 24 | #include "spkey.h" |
25 | #include "spkey_p.h" | 25 | #include "spkey_p.h" |
diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c index b153b4191f..3f0bc9319e 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -17,7 +17,7 @@ | |||
17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | #include "misc.h" | 20 | #include "zxmisc.h" |
21 | #include "zxconfig.h" | 21 | #include "zxconfig.h" |
22 | #include "lib/configfile.h" | 22 | #include "lib/configfile.h" |
23 | #include "lib/oldmenuapi.h" | 23 | #include "lib/oldmenuapi.h" |
@@ -361,7 +361,7 @@ static bool zxbox_menu(void) | |||
361 | { "Options", NULL }, | 361 | { "Options", NULL }, |
362 | { "Quit", NULL }, | 362 | { "Quit", NULL }, |
363 | }; | 363 | }; |
364 | 364 | ||
365 | m = menu_init(rb,items, sizeof(items) / sizeof(*items), | 365 | m = menu_init(rb,items, sizeof(items) / sizeof(*items), |
366 | NULL, NULL, NULL, NULL); | 366 | NULL, NULL, NULL, NULL); |
367 | 367 | ||
diff --git a/apps/plugins/zxbox/spsound.c b/apps/plugins/zxbox/spsound.c index c99c1e6729..f9a4c6caa7 100644 --- a/apps/plugins/zxbox/spsound.c +++ b/apps/plugins/zxbox/spsound.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos 2006 Anton Romanov | 2 | * Copyright (C) 1996-1998 Szeredi Miklos 2006 Anton Romanov |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -25,7 +25,7 @@ | |||
25 | #include "zxconfig.h" | 25 | #include "zxconfig.h" |
26 | #include "spperif.h" | 26 | #include "spperif.h" |
27 | #include "z80.h" | 27 | #include "z80.h" |
28 | #include "misc.h" | 28 | #include "zxmisc.h" |
29 | #include "interf.h" | 29 | #include "interf.h" |
30 | #include "spmain.h" | 30 | #include "spmain.h" |
31 | 31 | ||
diff --git a/apps/plugins/zxbox/sptape.c b/apps/plugins/zxbox/sptape.c index 76817ca68c..f0e04de2fb 100644 --- a/apps/plugins/zxbox/sptape.c +++ b/apps/plugins/zxbox/sptape.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -17,7 +17,7 @@ | |||
17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 17 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | #include "misc.h" | 20 | #include "zxmisc.h" |
21 | 21 | ||
22 | #include "sptape.h" | 22 | #include "sptape.h" |
23 | #include "tapefile.h" | 23 | #include "tapefile.h" |
diff --git a/apps/plugins/zxbox/misc.c b/apps/plugins/zxbox/zxmisc.c index c293677e16..df147be7bf 100644 --- a/apps/plugins/zxbox/misc.c +++ b/apps/plugins/zxbox/zxmisc.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include "misc.h" | 21 | #include "zxmisc.h" |
22 | #include "zxconfig.h" | 22 | #include "zxconfig.h" |
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <string.h> | 24 | #include <string.h> |