summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/agent/tests/basic_auth_library.cc2
-rw-r--r--src/bin/agent/tests/ca_response_creator_unittests.cc2
-rw-r--r--src/bin/d2/d2_lexer.cc41
-rw-r--r--src/bin/d2/location.hh1
-rw-r--r--src/bin/dhcp4/location.hh1
-rw-r--r--src/bin/dhcp6/location.hh1
-rw-r--r--src/lib/config/command_mgr.h2
-rw-r--r--src/lib/eval/eval_context.h2
-rw-r--r--src/lib/eval/eval_messages.cc2
-rw-r--r--src/lib/eval/eval_messages.h1
-rw-r--r--src/lib/eval/eval_messages.mes42
-rw-r--r--src/lib/eval/evaluate.h2
-rw-r--r--src/lib/eval/location.hh1
-rw-r--r--src/lib/http/tests/request_parser_unittests.cc2
14 files changed, 49 insertions, 53 deletions
diff --git a/src/bin/agent/tests/basic_auth_library.cc b/src/bin/agent/tests/basic_auth_library.cc
index f5ae12075c..398487ded1 100644
--- a/src/bin/agent/tests/basic_auth_library.cc
+++ b/src/bin/agent/tests/basic_auth_library.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2024 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/agent/tests/ca_response_creator_unittests.cc b/src/bin/agent/tests/ca_response_creator_unittests.cc
index 1d64a74f5c..df394deb9d 100644
--- a/src/bin/agent/tests/ca_response_creator_unittests.cc
+++ b/src/bin/agent/tests/ca_response_creator_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc
index d4cfcb884d..5002ae721e 100644
--- a/src/bin/d2/d2_lexer.cc
+++ b/src/bin/d2/d2_lexer.cc
@@ -328,7 +328,6 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
@@ -453,7 +452,7 @@ typedef size_t yy_size_t;
#endif
/* %if-not-reentrant */
-extern yy_size_t yyleng;
+extern int yyleng;
/* %endif */
/* %if-c-only */
@@ -506,7 +505,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- yy_size_t yy_n_chars;
+ int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -587,8 +586,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
/* %not-for-header */
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
+int yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = NULL;
@@ -618,7 +617,7 @@ static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
/* %endif */
@@ -686,7 +685,7 @@ static void yynoreturn yy_fatal_error ( const char* msg );
#define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \
/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
- yyleng = (yy_size_t) (yy_cp - yy_bp); \
+ yyleng = (int) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
@@ -1213,7 +1212,7 @@ unsigned int comment_start_line = 0;
/* To avoid the call to exit... oops! */
#define YY_FATAL_ERROR(msg) isc::d2::D2ParserContext::fatal(msg)
-#line 1216 "d2_lexer.cc"
+#line 1215 "d2_lexer.cc"
/* noyywrap disables automatic rewinding for the next file to parse. Since we
always parse only a single string, there's no need to do any wraps. And
using yywrap requires linking with -lfl, which provides the default yywrap
@@ -1239,8 +1238,8 @@ unsigned int comment_start_line = 0;
by moving it ahead by yyleng bytes. yyleng specifies the length of the
currently matched token. */
#define YY_USER_ACTION driver.loc_.columns(yyleng);
+#line 1241 "d2_lexer.cc"
#line 1242 "d2_lexer.cc"
-#line 1243 "d2_lexer.cc"
#define INITIAL 0
#define COMMENT 1
@@ -1296,7 +1295,7 @@ FILE *yyget_out ( void );
void yyset_out ( FILE * _out_str );
- yy_size_t yyget_leng ( void );
+ int yyget_leng ( void );
char *yyget_text ( void );
@@ -1383,7 +1382,7 @@ static int input ( void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- yy_size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1560,7 +1559,7 @@ YY_DECL
}
-#line 1563 "d2_lexer.cc"
+#line 1562 "d2_lexer.cc"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -2811,7 +2810,7 @@ YY_RULE_SETUP
#line 1020 "d2_lexer.ll"
ECHO;
YY_BREAK
-#line 2814 "d2_lexer.cc"
+#line 2813 "d2_lexer.cc"
case YY_END_OF_BUFFER:
{
@@ -3013,7 +3012,7 @@ static int yy_get_next_buffer (void)
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -3027,7 +3026,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- yy_size_t new_size = b->yy_buf_size * 2;
+ int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -3085,7 +3084,7 @@ static int yy_get_next_buffer (void)
if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -3206,7 +3205,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+ int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -3649,12 +3648,12 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, yy_size_t _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
yy_size_t n;
- yy_size_t i;
+ int i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = (yy_size_t) (_yybytes_len + 2);
@@ -3701,7 +3700,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
do \
{ \
/* Undo effects of setting up yytext. */ \
- yy_size_t yyless_macro_arg = (n); \
+ int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
yytext[yyleng] = (yy_hold_char); \
(yy_c_buf_p) = yytext + yyless_macro_arg; \
@@ -3745,7 +3744,7 @@ FILE *yyget_out (void)
/** Get the length of the current token.
*
*/
-yy_size_t yyget_leng (void)
+int yyget_leng (void)
{
return yyleng;
}
diff --git a/src/bin/d2/location.hh b/src/bin/d2/location.hh
index dd188b83fb..4145366614 100644
--- a/src/bin/d2/location.hh
+++ b/src/bin/d2/location.hh
@@ -1,4 +1,3 @@
-// Generated 202407231401
// A Bison parser, made by GNU Bison 3.8.2.
// Locations for Bison parsers in C++
diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index 3b5cfa605e..860fbfa0c9 100644
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,3 @@
-// Generated 202407231401
// A Bison parser, made by GNU Bison 3.8.2.
// Locations for Bison parsers in C++
diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index 164322bdde..4fb140a70e 100644
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,3 @@
-// Generated 202407231401
// A Bison parser, made by GNU Bison 3.8.2.
// Locations for Bison parsers in C++
diff --git a/src/lib/config/command_mgr.h b/src/lib/config/command_mgr.h
index d1eee35c10..91f2c8f39a 100644
--- a/src/lib/config/command_mgr.h
+++ b/src/lib/config/command_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/eval/eval_context.h b/src/lib/eval/eval_context.h
index 9a086e4432..033ff088f0 100644
--- a/src/lib/eval/eval_context.h
+++ b/src/lib/eval/eval_context.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/eval/eval_messages.cc b/src/lib/eval/eval_messages.cc
index 72324a3f32..5872f8ca3b 100644
--- a/src/lib/eval/eval_messages.cc
+++ b/src/lib/eval/eval_messages.cc
@@ -59,7 +59,6 @@ extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID = "EVAL_DEBUG_V
extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH = "EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH";
extern const isc::log::MessageID EVAL_DEBUG_VENDOR_EXISTS = "EVAL_DEBUG_VENDOR_EXISTS";
extern const isc::log::MessageID EVAL_DEBUG_VENDOR_NO_OPTION = "EVAL_DEBUG_VENDOR_NO_OPTION";
-extern const isc::log::MessageID EVAL_RESULT = "EVAL_RESULT";
} // namespace dhcp
} // namespace isc
@@ -119,7 +118,6 @@ const char* values[] = {
"EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH", "%1: Was looking for %2, option had %3, pushing result '%4'",
"EVAL_DEBUG_VENDOR_EXISTS", "%1: Option with enterprise-id %2 found, pushing result '%3'",
"EVAL_DEBUG_VENDOR_NO_OPTION", "%1: Option with code %2 missing, pushing result '%3'",
- "EVAL_RESULT", "%1: Expression %2 evaluated to %3",
NULL
};
diff --git a/src/lib/eval/eval_messages.h b/src/lib/eval/eval_messages.h
index 4eb7f66513..41747f7743 100644
--- a/src/lib/eval/eval_messages.h
+++ b/src/lib/eval/eval_messages.h
@@ -60,7 +60,6 @@ extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID;
extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH;
extern const isc::log::MessageID EVAL_DEBUG_VENDOR_EXISTS;
extern const isc::log::MessageID EVAL_DEBUG_VENDOR_NO_OPTION;
-extern const isc::log::MessageID EVAL_RESULT;
} // namespace dhcp
} // namespace isc
diff --git a/src/lib/eval/eval_messages.mes b/src/lib/eval/eval_messages.mes
index c30e59a668..7dedeb4e3e 100644
--- a/src/lib/eval/eval_messages.mes
+++ b/src/lib/eval/eval_messages.mes
@@ -15,6 +15,7 @@ the value stack. Then are then combined via logical and and
the result is pushed onto the value stack.
# For use with TokenBranch
+
% EVAL_DEBUG_BRANCH Branching to %1
Logged at debug log level 55.
This debug message indicates that an unconditional branch is performed
@@ -129,25 +130,6 @@ the value stack, negated and then pushed onto the value stack.
The string is displayed in text.
# For use with TokenPopAndBranchFalse
-% EVAL_DEBUG_POP_AND_BRANCH_FALSE Value is false: branching to %1
-Logged at debug log level 55.
-This debug message indicates that a branch on false condition is performed
-to the displayed target.
-
-# For use with TokenPopOrBranchFalse
-% EVAL_DEBUG_POP_OR_BRANCH_FALSE Value is false: keeping it and branching to %1
-Logged at debug log level 55.
-This debug message indicates that a branch on false condition is performed
-to the displayed target.
-
-# For use with TokenPopOrBranchTrue
-% EVAL_DEBUG_POP_OR_BRANCH_TRUE Value is true: keeping it and branching to %1
-Logged at debug log level 55.
-This debug message indicates that a branch on true condition is performed
-to the displayed target.
-
-# For use with TokenOption based classes. These include TokenOption,
-# TokenRelay4Option and TokenRelay6Option.
% EVAL_DEBUG_OPTION %1: Pushing option %2 with value %3
Logged at debug log level 55.
@@ -193,6 +175,28 @@ The string is displayed in hex.
# For use with TokenRelay6Field
+% EVAL_DEBUG_POP_AND_BRANCH_FALSE Value is false: branching to %1
+Logged at debug log level 55.
+This debug message indicates that a branch on false condition is performed
+to the displayed target.
+
+# For use with TokenPopOrBranchFalse
+
+% EVAL_DEBUG_POP_OR_BRANCH_FALSE Value is false: keeping it and branching to %1
+Logged at debug log level 55.
+This debug message indicates that a branch on false condition is performed
+to the displayed target.
+
+# For use with TokenPopOrBranchTrue
+
+% EVAL_DEBUG_POP_OR_BRANCH_TRUE Value is true: keeping it and branching to %1
+Logged at debug log level 55.
+This debug message indicates that a branch on true condition is performed
+to the displayed target.
+
+# For use with TokenOption based classes. These include TokenOption,
+# TokenRelay4Option and TokenRelay6Option.
+
% EVAL_DEBUG_RELAY6 %1: Pushing PKT6 relay field %2 nest %3 with value %4
Logged at debug log level 55.
This debug message indicates that the given binary string representing
diff --git a/src/lib/eval/evaluate.h b/src/lib/eval/evaluate.h
index c572debbf2..3e4c2c3be2 100644
--- a/src/lib/eval/evaluate.h
+++ b/src/lib/eval/evaluate.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh
index 674df6e31a..5bde47985a 100644
--- a/src/lib/eval/location.hh
+++ b/src/lib/eval/location.hh
@@ -1,4 +1,3 @@
-// Generated 202408071949
// A Bison parser, made by GNU Bison 3.8.2.
// Locations for Bison parsers in C++
diff --git a/src/lib/http/tests/request_parser_unittests.cc b/src/lib/http/tests/request_parser_unittests.cc
index 8f1701d091..db0ff9098d 100644
--- a/src/lib/http/tests/request_parser_unittests.cc
+++ b/src/lib/http/tests/request_parser_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 20:38:59 +0100