firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:03:02 +01:00
Code Issues

I became tired of the many warnings in btyacc (really ugly code) and decided to solve or hide most of them.

Browse Source
This commit is contained in:
robocop 2008-09-05 08:47:48 +00:00
parent e431ca56de
commit 521d215225
4 changed files with 81 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
builds/win32/msvc9/btyacc.vcproj
View File

@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="0"
UsePrecompiledHeader="0"
@ -88,6 +88,72 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
CharacterSet="2"
ManagedExtensions="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="false"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).exe"
LinkIncremental="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
ConfigurationType="1"
@ -159,72 +225,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
CharacterSet="2"
ManagedExtensions="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="false"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).exe"
LinkIncremental="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
ConfigurationType="1"

7
extern/btyacc/main.c vendored
View File

@ -8,6 +8,13 @@
#include <unistd.h>
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1500
// ISO C++ conformant names
#define unlink _unlink
#define mktemp _mktemp
#define strdup _strdup
#endif
char dflag;
char lflag;
char rflag;

11
extern/btyacc/mstring.c vendored
View File

@ -2,9 +2,10 @@
#include "mstring.h"
#include <stdarg.h>
/* parameters about string length. START is the starting size and
** START+TAIL should be a power of two */
#define START 24
/* parameters about string length. START_STR is the starting size and
** START_STR+TAIL should be a power of two
Renamed to START_STR because START is defined in defs.h with another value */
#define START_STR 24
#define TAIL 8
void msprintf(struct mstring *s, const char *fmt, ...)
@ -51,8 +52,8 @@ int mputchar(struct mstring *s, int ch)
struct mstring *msnew(void) {
struct mstring *n = malloc(sizeof(struct mstring));
if (n && (n->base = n->ptr = malloc(START)))
n->end = n->base + START;
if (n && (n->base = n->ptr = malloc(START_STR)))
n->end = n->base + START_STR;
else if (n) {
free(n);
n = 0; }

2
extern/btyacc/readskel.c vendored
View File

@ -10,7 +10,7 @@ static char **ap, **ap_end, **ap_start;
static void add_ptr(char *p)
{
if (ap == ap_end) {
int size = CHUNK;
unsigned int size = CHUNK;
char **nap;
while ((ap-ap_start) * sizeof(char *) >= size)
size = size * 2;