2018-01-01 20:21:51 +01:00
|
|
|
From acd96b8c80a584d877845646ceac388feda46748 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
Date: Mon, 1 Jan 2018 19:28:24 +0100
|
|
|
|
|
Subject: [PATCH] build: fix gcc warnings abuot old K&R style function
|
|
|
|
|
declarations
|
2012-05-16 12:24:23 +02:00
|
|
|
|
2018-01-01 20:21:51 +01:00
|
|
|
Older gcc complain about the K&R-style prototype. Fix 'em.
|
|
|
|
|
(Forward ported from a deutex 4.4.x patch.)
|
2012-05-16 12:24:23 +02:00
|
|
|
src/deutex.c:108:1: warning: function declaration is not a prototype
|
|
|
|
|
src/deutex.c:1611:13: warning: function declaration is not a prototype
|
|
|
|
|
---
|
2018-01-01 20:21:51 +01:00
|
|
|
src/deutex.c | 4 ++--
|
2012-05-16 12:24:23 +02:00
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2018-01-01 20:21:51 +01:00
|
|
|
diff --git a/src/deutex.c b/src/deutex.c
|
|
|
|
|
index 15ff8c3..505a352 100644
|
Accepting request 560959 from home:avindra
- update to 5.1.0
* General
- The -overwrite option now works.
- Levels are extracted/inserted in a way to preserve GL nodes.
- Inserting pictures with a height of 1 pixel no longer causes
a malloc error, and allows the operation of rebuilding a
Doom 1 or 2 IWAD.
- texture lump file names can now be overridden.
* Graphics
- DeuTex supports reading and writing sprite offsets based on
PNG grab chunks in a manner compatible with SLADE and ZDoom.
wadinfo.txt overrides these offsets unless -pngoffsets is used.
- includes 5.0.0
* Removed features
- DeuSF.
- -man troff format generation.
- WinTex options.
- -fullsnd: now the only mode.
- MS-DOS and OS/2 compatibility.
- Incomplete (and conditioned out) Rise of the Triad support.
* File format support
- PNG support added, creating an optional dependency on libpng
1.6. If compiled in, it is the default extraction format,
PPM otherwise.
- Au and VOC sound formats removed. WAV is the only supported
format for extraction and creation.
- Full sound lumps from the WAD are always extracted.
- MIDI files can be included just by being named *.mid, and
are extracted to the same file name extension.
* General
- Log file support has been removed, in favor of the user
doing a shell redirection (eg, with > or 2>) instead.
- Arch-vile sprites are now extracted and inserted using
literal names for sprites with the [ and ] characters in
names (was illegal in DOS), and sprite names with \ are
now altered to use ^ on-disk, matching the ZDoom PK3
standard.
- Graphics with a height > 128 are now inserted into Doom WAD
files correctly.
- UDMF (Universal Doom Map Format) support.
* Build systems, code standards
- Real Autoconf+Automake build system to replace the
barely-functioning imitation one. ./configure, make, and
related environment variables work as should be expected.
- MS-DOS and OS/2 batch files removed.
- A malloc.h include was removed to allow compilation on MacOS,
and is not needed by current Unix systems in general.
- Major cleanup, linting and refactoring
- C99-style cleanups to use (u)intN_t types, bool, true,
false throughout the code, replacing old defines.
- AsciiDoc now used for documentation
- cleanup with spec-cleaner
- remove patches obsoleted by upstream cleanup and refactoring
* deutex-automake.diff
* deutex-braces.diff
* deutex-init-stdfp.diff
- check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d)
* deutex-soundbuf.diff
- rebase deutex-proto.diff
- rebase deutex-nolimit.diff
- renumber patches
OBS-URL: https://build.opensuse.org/request/show/560959
OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=3
2018-01-01 19:58:32 +01:00
|
|
|
--- a/src/deutex.c
|
|
|
|
|
+++ b/src/deutex.c
|
|
|
|
|
@@ -76,7 +76,7 @@ const char *palette_lump = "PLAYPAL";
|
|
|
|
|
static char anon[1] = { '\0' };
|
2012-05-16 12:24:23 +02:00
|
|
|
|
|
|
|
|
typedef void (*comfun_t) (int argc, const char *argv[]);
|
Accepting request 560959 from home:avindra
- update to 5.1.0
* General
- The -overwrite option now works.
- Levels are extracted/inserted in a way to preserve GL nodes.
- Inserting pictures with a height of 1 pixel no longer causes
a malloc error, and allows the operation of rebuilding a
Doom 1 or 2 IWAD.
- texture lump file names can now be overridden.
* Graphics
- DeuTex supports reading and writing sprite offsets based on
PNG grab chunks in a manner compatible with SLADE and ZDoom.
wadinfo.txt overrides these offsets unless -pngoffsets is used.
- includes 5.0.0
* Removed features
- DeuSF.
- -man troff format generation.
- WinTex options.
- -fullsnd: now the only mode.
- MS-DOS and OS/2 compatibility.
- Incomplete (and conditioned out) Rise of the Triad support.
* File format support
- PNG support added, creating an optional dependency on libpng
1.6. If compiled in, it is the default extraction format,
PPM otherwise.
- Au and VOC sound formats removed. WAV is the only supported
format for extraction and creation.
- Full sound lumps from the WAD are always extracted.
- MIDI files can be included just by being named *.mid, and
are extracted to the same file name extension.
* General
- Log file support has been removed, in favor of the user
doing a shell redirection (eg, with > or 2>) instead.
- Arch-vile sprites are now extracted and inserted using
literal names for sprites with the [ and ] characters in
names (was illegal in DOS), and sprite names with \ are
now altered to use ^ on-disk, matching the ZDoom PK3
standard.
- Graphics with a height > 128 are now inserted into Doom WAD
files correctly.
- UDMF (Universal Doom Map Format) support.
* Build systems, code standards
- Real Autoconf+Automake build system to replace the
barely-functioning imitation one. ./configure, make, and
related environment variables work as should be expected.
- MS-DOS and OS/2 batch files removed.
- A malloc.h include was removed to allow compilation on MacOS,
and is not needed by current Unix systems in general.
- Major cleanup, linting and refactoring
- C99-style cleanups to use (u)intN_t types, bool, true,
false throughout the code, replacing old defines.
- AsciiDoc now used for documentation
- cleanup with spec-cleaner
- remove patches obsoleted by upstream cleanup and refactoring
* deutex-automake.diff
* deutex-braces.diff
* deutex-init-stdfp.diff
- check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d)
* deutex-soundbuf.diff
- rebase deutex-proto.diff
- rebase deutex-nolimit.diff
- renumber patches
OBS-URL: https://build.opensuse.org/request/show/560959
OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=3
2018-01-01 19:58:32 +01:00
|
|
|
-static void opt_widths();
|
|
|
|
|
+static void opt_widths(void);
|
|
|
|
|
static int is_prefix(const char *s1, const char *s2);
|
|
|
|
|
static void call_opt(comfun_t func, ...);
|
2012-05-16 12:24:23 +02:00
|
|
|
|
Accepting request 560959 from home:avindra
- update to 5.1.0
* General
- The -overwrite option now works.
- Levels are extracted/inserted in a way to preserve GL nodes.
- Inserting pictures with a height of 1 pixel no longer causes
a malloc error, and allows the operation of rebuilding a
Doom 1 or 2 IWAD.
- texture lump file names can now be overridden.
* Graphics
- DeuTex supports reading and writing sprite offsets based on
PNG grab chunks in a manner compatible with SLADE and ZDoom.
wadinfo.txt overrides these offsets unless -pngoffsets is used.
- includes 5.0.0
* Removed features
- DeuSF.
- -man troff format generation.
- WinTex options.
- -fullsnd: now the only mode.
- MS-DOS and OS/2 compatibility.
- Incomplete (and conditioned out) Rise of the Triad support.
* File format support
- PNG support added, creating an optional dependency on libpng
1.6. If compiled in, it is the default extraction format,
PPM otherwise.
- Au and VOC sound formats removed. WAV is the only supported
format for extraction and creation.
- Full sound lumps from the WAD are always extracted.
- MIDI files can be included just by being named *.mid, and
are extracted to the same file name extension.
* General
- Log file support has been removed, in favor of the user
doing a shell redirection (eg, with > or 2>) instead.
- Arch-vile sprites are now extracted and inserted using
literal names for sprites with the [ and ] characters in
names (was illegal in DOS), and sprite names with \ are
now altered to use ^ on-disk, matching the ZDoom PK3
standard.
- Graphics with a height > 128 are now inserted into Doom WAD
files correctly.
- UDMF (Universal Doom Map Format) support.
* Build systems, code standards
- Real Autoconf+Automake build system to replace the
barely-functioning imitation one. ./configure, make, and
related environment variables work as should be expected.
- MS-DOS and OS/2 batch files removed.
- A malloc.h include was removed to allow compilation on MacOS,
and is not needed by current Unix systems in general.
- Major cleanup, linting and refactoring
- C99-style cleanups to use (u)intN_t types, bool, true,
false throughout the code, replacing old defines.
- AsciiDoc now used for documentation
- cleanup with spec-cleaner
- remove patches obsoleted by upstream cleanup and refactoring
* deutex-automake.diff
* deutex-braces.diff
* deutex-init-stdfp.diff
- check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d)
* deutex-soundbuf.diff
- rebase deutex-proto.diff
- rebase deutex-nolimit.diff
- renumber patches
OBS-URL: https://build.opensuse.org/request/show/560959
OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=3
2018-01-01 19:58:32 +01:00
|
|
|
@@ -1212,7 +1212,7 @@ void COMformat(int argc, const char *argv[])
|
2012-05-16 12:24:23 +02:00
|
|
|
/*
|
Accepting request 560959 from home:avindra
- update to 5.1.0
* General
- The -overwrite option now works.
- Levels are extracted/inserted in a way to preserve GL nodes.
- Inserting pictures with a height of 1 pixel no longer causes
a malloc error, and allows the operation of rebuilding a
Doom 1 or 2 IWAD.
- texture lump file names can now be overridden.
* Graphics
- DeuTex supports reading and writing sprite offsets based on
PNG grab chunks in a manner compatible with SLADE and ZDoom.
wadinfo.txt overrides these offsets unless -pngoffsets is used.
- includes 5.0.0
* Removed features
- DeuSF.
- -man troff format generation.
- WinTex options.
- -fullsnd: now the only mode.
- MS-DOS and OS/2 compatibility.
- Incomplete (and conditioned out) Rise of the Triad support.
* File format support
- PNG support added, creating an optional dependency on libpng
1.6. If compiled in, it is the default extraction format,
PPM otherwise.
- Au and VOC sound formats removed. WAV is the only supported
format for extraction and creation.
- Full sound lumps from the WAD are always extracted.
- MIDI files can be included just by being named *.mid, and
are extracted to the same file name extension.
* General
- Log file support has been removed, in favor of the user
doing a shell redirection (eg, with > or 2>) instead.
- Arch-vile sprites are now extracted and inserted using
literal names for sprites with the [ and ] characters in
names (was illegal in DOS), and sprite names with \ are
now altered to use ^ on-disk, matching the ZDoom PK3
standard.
- Graphics with a height > 128 are now inserted into Doom WAD
files correctly.
- UDMF (Universal Doom Map Format) support.
* Build systems, code standards
- Real Autoconf+Automake build system to replace the
barely-functioning imitation one. ./configure, make, and
related environment variables work as should be expected.
- MS-DOS and OS/2 batch files removed.
- A malloc.h include was removed to allow compilation on MacOS,
and is not needed by current Unix systems in general.
- Major cleanup, linting and refactoring
- C99-style cleanups to use (u)intN_t types, bool, true,
false throughout the code, replacing old defines.
- AsciiDoc now used for documentation
- cleanup with spec-cleaner
- remove patches obsoleted by upstream cleanup and refactoring
* deutex-automake.diff
* deutex-braces.diff
* deutex-init-stdfp.diff
- check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d)
* deutex-soundbuf.diff
- rebase deutex-proto.diff
- rebase deutex-nolimit.diff
- renumber patches
OBS-URL: https://build.opensuse.org/request/show/560959
OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=3
2018-01-01 19:58:32 +01:00
|
|
|
* opt_widths - make a pass through Com and compute widths per section
|
2012-05-16 12:24:23 +02:00
|
|
|
*/
|
Accepting request 560959 from home:avindra
- update to 5.1.0
* General
- The -overwrite option now works.
- Levels are extracted/inserted in a way to preserve GL nodes.
- Inserting pictures with a height of 1 pixel no longer causes
a malloc error, and allows the operation of rebuilding a
Doom 1 or 2 IWAD.
- texture lump file names can now be overridden.
* Graphics
- DeuTex supports reading and writing sprite offsets based on
PNG grab chunks in a manner compatible with SLADE and ZDoom.
wadinfo.txt overrides these offsets unless -pngoffsets is used.
- includes 5.0.0
* Removed features
- DeuSF.
- -man troff format generation.
- WinTex options.
- -fullsnd: now the only mode.
- MS-DOS and OS/2 compatibility.
- Incomplete (and conditioned out) Rise of the Triad support.
* File format support
- PNG support added, creating an optional dependency on libpng
1.6. If compiled in, it is the default extraction format,
PPM otherwise.
- Au and VOC sound formats removed. WAV is the only supported
format for extraction and creation.
- Full sound lumps from the WAD are always extracted.
- MIDI files can be included just by being named *.mid, and
are extracted to the same file name extension.
* General
- Log file support has been removed, in favor of the user
doing a shell redirection (eg, with > or 2>) instead.
- Arch-vile sprites are now extracted and inserted using
literal names for sprites with the [ and ] characters in
names (was illegal in DOS), and sprite names with \ are
now altered to use ^ on-disk, matching the ZDoom PK3
standard.
- Graphics with a height > 128 are now inserted into Doom WAD
files correctly.
- UDMF (Universal Doom Map Format) support.
* Build systems, code standards
- Real Autoconf+Automake build system to replace the
barely-functioning imitation one. ./configure, make, and
related environment variables work as should be expected.
- MS-DOS and OS/2 batch files removed.
- A malloc.h include was removed to allow compilation on MacOS,
and is not needed by current Unix systems in general.
- Major cleanup, linting and refactoring
- C99-style cleanups to use (u)intN_t types, bool, true,
false throughout the code, replacing old defines.
- AsciiDoc now used for documentation
- cleanup with spec-cleaner
- remove patches obsoleted by upstream cleanup and refactoring
* deutex-automake.diff
* deutex-braces.diff
* deutex-init-stdfp.diff
- check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d)
* deutex-soundbuf.diff
- rebase deutex-proto.diff
- rebase deutex-nolimit.diff
- renumber patches
OBS-URL: https://build.opensuse.org/request/show/560959
OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=3
2018-01-01 19:58:32 +01:00
|
|
|
-static void opt_widths()
|
|
|
|
|
+static void opt_widths(void)
|
2012-05-16 12:24:23 +02:00
|
|
|
{
|
Accepting request 560959 from home:avindra
- update to 5.1.0
* General
- The -overwrite option now works.
- Levels are extracted/inserted in a way to preserve GL nodes.
- Inserting pictures with a height of 1 pixel no longer causes
a malloc error, and allows the operation of rebuilding a
Doom 1 or 2 IWAD.
- texture lump file names can now be overridden.
* Graphics
- DeuTex supports reading and writing sprite offsets based on
PNG grab chunks in a manner compatible with SLADE and ZDoom.
wadinfo.txt overrides these offsets unless -pngoffsets is used.
- includes 5.0.0
* Removed features
- DeuSF.
- -man troff format generation.
- WinTex options.
- -fullsnd: now the only mode.
- MS-DOS and OS/2 compatibility.
- Incomplete (and conditioned out) Rise of the Triad support.
* File format support
- PNG support added, creating an optional dependency on libpng
1.6. If compiled in, it is the default extraction format,
PPM otherwise.
- Au and VOC sound formats removed. WAV is the only supported
format for extraction and creation.
- Full sound lumps from the WAD are always extracted.
- MIDI files can be included just by being named *.mid, and
are extracted to the same file name extension.
* General
- Log file support has been removed, in favor of the user
doing a shell redirection (eg, with > or 2>) instead.
- Arch-vile sprites are now extracted and inserted using
literal names for sprites with the [ and ] characters in
names (was illegal in DOS), and sprite names with \ are
now altered to use ^ on-disk, matching the ZDoom PK3
standard.
- Graphics with a height > 128 are now inserted into Doom WAD
files correctly.
- UDMF (Universal Doom Map Format) support.
* Build systems, code standards
- Real Autoconf+Automake build system to replace the
barely-functioning imitation one. ./configure, make, and
related environment variables work as should be expected.
- MS-DOS and OS/2 batch files removed.
- A malloc.h include was removed to allow compilation on MacOS,
and is not needed by current Unix systems in general.
- Major cleanup, linting and refactoring
- C99-style cleanups to use (u)intN_t types, bool, true,
false throughout the code, replacing old defines.
- AsciiDoc now used for documentation
- cleanup with spec-cleaner
- remove patches obsoleted by upstream cleanup and refactoring
* deutex-automake.diff
* deutex-braces.diff
* deutex-init-stdfp.diff
- check_types removed (b76fafa6fee9a64929e7b1087ac36ea3ce39e27d)
* deutex-soundbuf.diff
- rebase deutex-proto.diff
- rebase deutex-nolimit.diff
- renumber patches
OBS-URL: https://build.opensuse.org/request/show/560959
OBS-URL: https://build.opensuse.org/package/show/games:tools/deutex?expand=0&rev=3
2018-01-01 19:58:32 +01:00
|
|
|
comdef_t *d;
|
|
|
|
|
comdef_t *current_section = NULL;
|
2018-01-01 20:21:51 +01:00
|
|
|
--
|
|
|
|
|
2.15.1
|
|
|
|
|
|
