soltools/cpp/_tokens.c | 208 -------------------------------------------------
soltools/cpp/_unix.c | 5 -
soltools/cpp/cpp.h | 1
3 files changed, 1 insertion(+), 213 deletions(-)
New commits:
commit bde11b3b1362a9451ef830bf14d0f8842818a922
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Nov 10 09:16:52 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Nov 10 11:50:44 2022 +0100
Executable_cpp: Drop unused -Xa "EBCDIC to ANSI conversion" option
...which nicely gets rid of a bunch of sprintf calls that otherwise could
have
caused -Werror,-Wdeprecated-declarations with macOS 13 SDK now).
(That executable is only used during the build to process the .scp files.)
Change-Id: I3b087b11f6d3d1bce9e595322a21e67986f5d1c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142537
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
index bf2803845c20..5cb403c270ed 100644
--- a/soltools/cpp/_tokens.c
+++ b/soltools/cpp/_tokens.c
@@ -32,171 +32,6 @@
static char wbuf[4 * OBS];
static char *wbp = wbuf;
-static int EBCDIC_ExternTokenDetected = 0;
-static int EBCDIC_StartTokenDetected = 0;
-
-static unsigned char toLatin1[256] =
-{
- 0x00, 0x01, 0x02, 0x03, 0x9c, 0x09, 0x86, 0x7f, 0x97, 0x8d,
- 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
- 0x9d, 0x0a, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8f, 0x1c, 0x1d,
- 0x1e, 0x1f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x17, 0x1b,
- 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, 0x90, 0x91,
- 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9a, 0x9b,
- 0x14, 0x15, 0x9e, 0x1a, 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1,
- 0xe3, 0xe5, 0xe7, 0xf1, 0xa2, 0x2e, 0x3c, 0x28, 0x2b, 0x7c,
- 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, 0xec, 0xdf,
- 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x5e, 0x2d, 0x2f, 0xc2, 0xc4,
- 0xc0, 0xc1, 0xc3, 0xc5, 0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f,
- 0x3e, 0x3f, 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
- 0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22,
- 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
- 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, 0xb0, 0x6a, 0x6b, 0x6c,
- 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8,
- 0xc6, 0xa4, 0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
- 0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0x5b, 0xde, 0xae, 0xac, 0xa3,
- 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, 0xbd, 0xbe, 0xdd, 0xa8,
- 0xaf, 0x5d, 0xb4, 0xd7, 0x7b, 0x41, 0x42, 0x43, 0x44, 0x45,
- 0x46, 0x47, 0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5,
- 0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52,
- 0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, 0x5c, 0xf7, 0x53, 0x54,
- 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2,
- 0xd3, 0xd5, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
- 0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f
-};
-
-#define MASK "\\x%x"
-
-static int
- memcpy_EBCDIC( char * pwbuf, uchar const *p, int len )
-{
- int currpos = 0;
- int processedchars = 0;
-
- if( len == 0 )
- return 0;
-
- if( len == 1 )
- {
- *pwbuf = *p;
- return 1;
- }
-
- /* copy spaces until " or ' */
- while( (p[ processedchars ] != '\"') && (p[ processedchars ] != '\'') )
- pwbuf[ currpos++ ] = p[ processedchars++ ];
-
- /* copy first " or ' */
- pwbuf[ currpos++ ] = p[ processedchars++ ];
-
- /* convert all characters until " or ' */
- while( processedchars < (len - 1) )
- {
- if( p[ processedchars ] == '\\' )
- {
- switch( p[ ++processedchars ] )
- {
- case 'n':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\n'] );
- processedchars++;
- break;
-
- case 't':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\t'] );
- processedchars++;
- break;
-
- case 'v':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\v'] );
- processedchars++;
- break;
-
- case 'b':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\b'] );
- processedchars++;
- break;
-
- case 'r':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\r'] );
- processedchars++;
- break;
-
- case 'f':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\f'] );
- processedchars++;
- break;
-
- case 'a':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\a'] );
- processedchars++;
- break;
-
- case '\\':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\\'] );
- processedchars++;
- break;
-
- case '?':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\?'] );
- processedchars++;
- break;
-
- case '\'':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\''] );
- processedchars++;
- break;
-
- case '"':
- currpos += sprintf( &pwbuf[ currpos ], MASK,
toLatin1['\"'] );
- processedchars++;
- break;
-
- /* octal coded character? -> copy */
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- {
- int startpos = currpos;
-
- pwbuf[ currpos++ ] = '\\';
-
- while( p[ processedchars ] >= '0' && p[ processedchars ]
<= '7' && (currpos < startpos + 4) )
- pwbuf[ currpos++ ] = (unsigned char)p[
processedchars++ ];
- break;
- }
-
- /* hex coded character? -> copy */
- case 'x':
- case 'X':
- {
- int startpos = currpos;
-
- pwbuf[ currpos++ ] = '\\';
- pwbuf[ currpos++ ] = 'x';
- processedchars++;
-
- while( isxdigit( p[ processedchars ] ) && (currpos <
startpos + 4) )
- pwbuf[ currpos++ ] = (unsigned char)p[
processedchars++ ];
- break;
- }
-
- }
- }
- else
- currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1[p[
processedchars++ ]] );
-
- }
-
- /* copy last " or ' */
- pwbuf[ currpos++ ] = p[ processedchars ];
-
- return currpos;
-}
void
maketokenrow(int size, Tokenrow * trp)
@@ -443,48 +278,7 @@ void
}
}
- /* EBCDIC to ANSI conversion requested? */
- if( Aflag )
- {
- /* keyword __ToLatin1__ found? -> do conversion! */
- if( EBCDIC_StartTokenDetected )
- {
- /* previous token was 'extern'? -> don't convert current
token! */
- if( EBCDIC_ExternTokenDetected )
- {
- EBCDIC_ExternTokenDetected = 0;
- memcpy(wbp, p, len);
- }
- else
- {
- /* current token is keyword 'extern'? -> don't convert
following token! */
- if( (tp->wslen == 0) && (strncmp( (char*)p, "extern",
len ) == 0) )
- {
- EBCDIC_ExternTokenDetected = 1;
- memcpy(wbp, p, len);
- }
- else
- {
- /* token is string or char? -> process EBCDIC to
ANSI conversion */
- if ((tp->type == STRING) || (tp->type == CCON))
- len = memcpy_EBCDIC(wbp, p, len);
- else
- memcpy(wbp, p, len);
- }
- }
- }
- else
- /* keyword __ToLatin1__ found? -> don't copy keyword and
start conversion */
- if( (tp->type == NAME) && (strncmp( (char*)p,
"__ToLatin1__", len) == 0) )
- {
- EBCDIC_StartTokenDetected = 1;
- len = 0;
- }
- else
- memcpy(wbp, p, len);
- }
- else
- memcpy(wbp, p, len);
+ memcpy(wbp, p, len);
wbp += len;
}
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index 1135bb08ea40..7c411befebea 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -40,7 +40,6 @@
int Pflag = 0; /* print no line information */
int Iflag = 0; /* print includes */
int Mflag = 0; /* print macro expansion */
-int Aflag = 0; /* translate character sets */
int Xflag = 0; /* print pragma for include/import */
int Vflag = 0; /* verbose flag */
int Cflag = 0; /* do not remove any comments */
@@ -140,10 +139,6 @@ void
break;
switch (c)
{
- case 'a':
- Aflag++;
- break;
-
case 'i':
Xflag++;
break;
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index ab5a89fc99eb..000327561d52 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -235,7 +235,6 @@ extern int ifsatisfied[NIF];
extern int Mflag;
extern int Iflag;
extern int Pflag;
-extern int Aflag;
extern int Lflag;
extern int Xflag;
extern int Vflag;
