Module Name: src
Committed By: christos
Date: Sun Jun 20 12:01:07 UTC 2021
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.y sel-lex.l
sel.c sel.h
Removed Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.c sel-gram.h
sel-lex.c
Log Message:
remove generated files, custom #define prefixes to hide lex/yacc symbols
and yywrap.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.h \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.3 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel-gram.y,v 1.3 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel-gram.y,v 1.4 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2017 Kungliga Tekniska Högskolan
@@ -41,19 +41,6 @@
#include <stdlib.h>
#include <hx_locl.h>
-#if !defined(yylex)
-#define yylex _hx509_sel_yylex
-#define yywrap _hx509_sel_yywrap
-#endif
-#if !defined(yyparse)
-#define yyparse _hx509_sel_yyparse
-#define yyerror _hx509_sel_yyerror
-#define yylval _hx509_sel_yylval
-#define yychar _hx509_sel_yychar
-#define yydebug _hx509_sel_yydebug
-#define yynerrs _hx509_sel_yynerrs
-#endif
-
%}
%union {
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.3 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel-lex.l,v 1.3 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel-lex.l,v 1.4 2021/06/20 12:01:07 christos Exp $ */
%{
/*
@@ -72,6 +72,8 @@ struct hx_expr_input _hx509_expr_input;
#undef ECHO
%}
+
+%option noyywrap
%%
TRUE { return kw_TRUE; }
@@ -82,12 +84,12 @@ IN { return kw_IN; }
TAILMATCH { return kw_TAILMATCH; }
[A-Za-z][-A-Za-z0-9_]* {
- yylval.string = strdup ((const char *)yytext);
+ _hx509_sel_yylval.string = strdup ((const char *)_hx509_sel_yytext);
return IDENTIFIER;
}
-"\"" { yylval.string = handle_string(); return STRING; }
+"\"" { _hx509_sel_yylval.string = handle_string(); return STRING; }
\n { ++lineno; }
-[,.!={}()%] { return *yytext; }
+[,.!={}()%] { return *_hx509_sel_yytext; }
[ \t] ;
%%
@@ -122,16 +124,6 @@ handle_string(void)
return strdup(x);
}
-#if !defined(yywrap)
-#define yywrap _hx509_sel_yywrap
-#endif
-
-int
-yywrap ()
-{
- return 1;
-}
-
static int
lex_input(char *buf, int max_size)
{
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.2 Sat Jan 28 16:31:48 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.c,v 1.2 2017/01/28 21:31:48 christos Exp $ */
+/* $NetBSD: sel.c,v 1.3 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -219,7 +219,7 @@ _hx509_expr_parse(const char *buf)
_hx509_expr_input.error = NULL;
}
- yyparse();
+ _hx509_sel_yyparse();
return _hx509_expr_input.expr;
}
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.5 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.6
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.5 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.h,v 1.5 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel.h,v 1.6 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -69,20 +69,6 @@ struct hx_expr_input {
extern struct hx_expr_input _hx509_expr_input;
-#if !defined(yylex)
-#define yylex _hx509_sel_yylex
-#define yywrap _hx509_sel_yywrap
-#endif
-#if !defined(yyparse)
-#define yyparse _hx509_sel_yyparse
-#define yyerror _hx509_sel_yyerror
-#define yylval _hx509_sel_yylval
-#define yychar _hx509_sel_yychar
-#define yydebug _hx509_sel_yydebug
-#define yynerrs _hx509_sel_yynerrs
-#endif
-
-int _hx509_sel_yyparse(void);
-int _hx509_sel_yylex(void);
-void _hx509_sel_yyerror(const char *);
-
+extern int _hx509_sel_yyparse(void);
+extern int _hx509_sel_yylex(void);
+extern void _hx509_sel_yyerror(const char *);
