[PATCH] Enforce strict overflow checking
Andreas Schneider
asn at samba.org
Fri Mar 23 15:32:19 UTC 2018
On Friday, 23 March 2018 15:56:24 CET Stefan Metzmacher wrote:
> Am 23.03.2018 um 15:36 schrieb Andreas Schneider via samba-technical:
> > On Wednesday, 21 March 2018 18:26:04 CET Jeremy Allison wrote:
> >> Andreas, I think you're going to have to work this
> >> through on sn-devel first if it's going to go
> >> through.
> >
> > OK, the attached patchset builds on sn-devel (gcc is more picky there) and
> > a private autobuild is currently running and more than 60% of the tests
> > already passed.
> >
> > The ldb_qsort was tricky so I wrote a test for it.
> >
> > I've set '-Wstrict-overflow=1' for bison generated getdate.c which uses
> > C89
> > and our old nmbd code.
>
> We can't add a hardcoded "-Wstrict-overflow=1" to every build.
>
> We may have to just add -Wstrict-overflow=2 to PICKY_FLAGS,
> so that this isn't added with 'allow_warnings=True'.
>
> That would be a huge advantage already and makes sure we don't regress
> in most of our code.
Then we could do it like HAVE_WNO_UNUSED_FUNCTION and turn the warning off.
See attached.
Andreas
--
Andreas Schneider GPG-ID: CC014E3D
Samba Team asn at samba.org
www.samba.org
-------------- next part --------------
>From ab0ac45ae595a2867f98a470971d5fce695a4126 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 09:53:03 +0100
Subject: [PATCH 01/22] ldb: Add test for ldb_qsort()
Signed-off-by: Andreas Schneider <asn at samba.org>
---
lib/ldb/tests/test_ldb_qsort.c | 64 ++++++++++++++++++++++++++++++++++++++++++
lib/ldb/wscript | 8 +++++-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 lib/ldb/tests/test_ldb_qsort.c
diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c
new file mode 100644
index 00000000000..06e80d94379
--- /dev/null
+++ b/lib/ldb/tests/test_ldb_qsort.c
@@ -0,0 +1,64 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Copyright (C) 2018 Andreas Schneider <asn at samba.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include <ldb.h>
+
+static int cmp_integer(int *a, int *b, void *opaque)
+{
+ if (a == NULL || b == NULL) {
+ return 0;
+ }
+
+ if (*a > *b) {
+ return 1;
+ }
+
+ if (*a < *b) {
+ return -1;
+ }
+
+ return 0;
+}
+
+static void test_ldb_qsort(void **state)
+{
+ int a[6] = { 6, 3, 2, 7, 9, 4 };
+
+ ldb_qsort(a, 6, sizeof(int), NULL, (ldb_qsort_cmp_fn_t)cmp_integer);
+
+ assert_int_equal(a[0], 2);
+ assert_int_equal(a[1], 3);
+ assert_int_equal(a[2], 4);
+ assert_int_equal(a[3], 6);
+ assert_int_equal(a[4], 7);
+ assert_int_equal(a[5], 9);
+}
+
+int main(void) {
+ const struct CMUnitTest tests[] = {
+ cmocka_unit_test(test_ldb_qsort),
+ };
+
+ return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 1455f92eb2e..1c9573f1cc4 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -358,6 +358,11 @@ def build(bld):
deps='cmocka ldb',
install=False)
+ bld.SAMBA_BINARY('test_ldb_qsort',
+ source='tests/test_ldb_qsort.c',
+ deps='cmocka ldb',
+ install=False)
+
def test(ctx):
'''run ldb testsuite'''
import Utils, samba_utils, shutil
@@ -386,7 +391,8 @@ def test(ctx):
cmocka_ret = 0
for test_exe in ['ldb_tdb_mod_op_test',
- 'ldb_msg_test']:
+ 'ldb_msg_test',
+ 'test_ldb_qsort']:
cmd = os.path.join(Utils.g_module.blddir, test_exe)
cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd)
--
2.16.2
>From 70d43355d4ca637491076b6893816ce80e58dfac Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 16:25:30 +0100
Subject: [PATCH 02/22] ldb: Fix overflow checks
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
lib/ldb/common/qsort.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/ldb/common/qsort.c b/lib/ldb/common/qsort.c
index 1a0b886b8c2..012aaf3c403 100644
--- a/lib/ldb/common/qsort.c
+++ b/lib/ldb/common/qsort.c
@@ -59,9 +59,8 @@ typedef struct
#define CHAR_BIT 8
#endif
#define STACK_SIZE (CHAR_BIT * sizeof(size_t))
-#define PUSH(low, high) ((void) ((top->lo = (low)), (top->hi = (high)), ++top))
-#define POP(low, high) ((void) (--top, (low = top->lo), (high = top->hi)))
-#define STACK_NOT_EMPTY (stack < top)
+#define PUSH(low, high) ((void) ((stack[i].lo = (low)), (stack[i].hi = (high)), i++))
+#define POP(low, high) ((void) (i--, (low = stack[i].lo), (high = stack[i].hi)))
/* Order size using quicksort. This implementation incorporates
@@ -104,11 +103,11 @@ void ldb_qsort (void *const pbase, size_t total_elems, size_t size,
char *lo = base_ptr;
char *hi = &lo[size * (total_elems - 1)];
stack_node stack[STACK_SIZE];
- stack_node *top = stack;
+ size_t i = 0;
PUSH (NULL, NULL);
- while (STACK_NOT_EMPTY)
+ do
{
char *left_ptr;
char *right_ptr;
@@ -194,6 +193,7 @@ void ldb_qsort (void *const pbase, size_t total_elems, size_t size,
hi = right_ptr;
}
}
+ while (i > 0 && i < STACK_SIZE);
}
/* Once the BASE_PTR array is partially sorted by quicksort the rest
--
2.16.2
>From 871d673715b92a834e40b87f595ce872a09be15f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 14:32:49 +0100
Subject: [PATCH 03/22] third_party: Fix size type in cmocka
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
third_party/cmocka/cmocka.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/third_party/cmocka/cmocka.c b/third_party/cmocka/cmocka.c
index 14b2765b781..a5115c7cb5e 100644
--- a/third_party/cmocka/cmocka.c
+++ b/third_party/cmocka/cmocka.c
@@ -244,8 +244,8 @@ static void free_symbol_map_value(
static void remove_always_return_values(ListNode * const map_head,
const size_t number_of_symbol_names);
-static int check_for_leftover_values_list(const ListNode * head,
- const char * const error_message);
+static size_t check_for_leftover_values_list(const ListNode * head,
+ const char * const error_message);
static int check_for_leftover_values(
const ListNode * const map_head, const char * const error_message,
@@ -811,11 +811,11 @@ static void remove_always_return_values(ListNode * const map_head,
}
}
-static int check_for_leftover_values_list(const ListNode * head,
- const char * const error_message)
+static size_t check_for_leftover_values_list(const ListNode * head,
+ const char * const error_message)
{
ListNode *child_node;
- int leftover_count = 0;
+ size_t leftover_count = 0;
if (!list_empty(head))
{
for (child_node = head->next; child_node != head;
@@ -1952,10 +1952,10 @@ static const ListNode* check_point_allocated_blocks(void) {
/* Display the blocks allocated after the specified check point. This
* function returns the number of blocks displayed. */
-static int display_allocated_blocks(const ListNode * const check_point) {
+static size_t display_allocated_blocks(const ListNode * const check_point) {
const ListNode * const head = get_allocated_blocks_list();
const ListNode *node;
- int allocated_blocks = 0;
+ size_t allocated_blocks = 0;
assert_non_null(check_point);
assert_non_null(check_point->next);
@@ -1964,14 +1964,14 @@ static int display_allocated_blocks(const ListNode * const check_point) {
(const MallocBlockInfo*)node->value;
assert_non_null(block_info);
- if (!allocated_blocks) {
+ if (allocated_blocks == 0) {
cm_print_error("Blocks allocated...\n");
}
cm_print_error(SOURCE_LOCATION_FORMAT ": note: block %p allocated here\n",
block_info->location.file,
block_info->location.line,
block_info->block);
- allocated_blocks ++;
+ allocated_blocks++;
}
return allocated_blocks;
}
@@ -1997,10 +1997,10 @@ static void free_allocated_blocks(const ListNode * const check_point) {
/* Fail if any any blocks are allocated after the specified check point. */
static void fail_if_blocks_allocated(const ListNode * const check_point,
const char * const test_name) {
- const int allocated_blocks = display_allocated_blocks(check_point);
- if (allocated_blocks) {
+ const size_t allocated_blocks = display_allocated_blocks(check_point);
+ if (allocated_blocks > 0) {
free_allocated_blocks(check_point);
- cm_print_error("ERROR: %s leaked %d block(s)\n", test_name,
+ cm_print_error("ERROR: %s leaked %zu block(s)\n", test_name,
allocated_blocks);
exit_test(1);
}
--
2.16.2
>From d342e48f2071248c7b7e547dc641b8f226ff05f6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 17:19:39 +0100
Subject: [PATCH 04/22] third_party: Fix overflow checking in pam_wrapper
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
third_party/pam_wrapper/pam_wrapper.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/third_party/pam_wrapper/pam_wrapper.c b/third_party/pam_wrapper/pam_wrapper.c
index 482b38841a3..36d0aa6a679 100644
--- a/third_party/pam_wrapper/pam_wrapper.c
+++ b/third_party/pam_wrapper/pam_wrapper.c
@@ -567,7 +567,6 @@ static int p_copy(const char *src, const char *dst, const char *pdir, mode_t mod
}
for (;;) {
- char *p;
bread = read(srcfd, buf, BUFFER_SIZE);
if (bread == 0) {
/* done */
@@ -580,16 +579,21 @@ static int p_copy(const char *src, const char *dst, const char *pdir, mode_t mod
/* EXTRA UGLY HACK */
if (pdir != NULL) {
- p = buf;
+ size_t i;
+
+ for (i = 0; i < BUFFER_SIZE; i++) {
+ if (buf[i] == '/') {
+ char *p = &buf[i];
+
+ if (i + 10 > BUFFER_SIZE) {
+ break;
+ }
- while (p < buf + BUFFER_SIZE) {
- if (*p == '/') {
cmp = memcmp(p, "/etc/pam.d", 10);
if (cmp == 0) {
memcpy(p, pdir, 10);
}
}
- p++;
}
}
--
2.16.2
>From c5f5117dd18a4da5100351e03d92e0385098a2a3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 12:49:38 +0100
Subject: [PATCH 05/22] lib:util: Fix size types in fgets_slash()
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
lib/util/samba_util.h | 2 +-
lib/util/util_file.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index b78252316c8..7b96a595d43 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -352,7 +352,7 @@ const char **str_list_make_v3_const(TALLOC_CTX *mem_ctx,
*/
_PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint);
-char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, int maxlen, FILE *f);
+char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f);
/**
load a file into memory from a fd.
diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index 499e8c46693..bf2f3e1a27f 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -79,10 +79,10 @@ _PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint)
return data;
}
-char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, int maxlen, FILE *f)
+char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f)
{
char *s = s2;
- int len = 0;
+ size_t len = 0;
int c;
bool start_of_line = true;
--
2.16.2
>From 7773376a916f581f30a3ec9a1bb9042d52910c44 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 16:46:49 +0100
Subject: [PATCH 06/22] s4:registry: Fix size type and loop
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source4/lib/registry/tools/regshell.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 5308d30e849..48251c33ea4 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -428,7 +428,7 @@ static char **reg_complete_command(const char *text, int start, int end)
/* Complete command */
char **matches;
size_t len, samelen=0;
- int i, count=1;
+ size_t i, count = 1;
matches = malloc_array_p(char *, MAX_COMPLETIONS);
if (!matches) return NULL;
@@ -463,10 +463,8 @@ static char **reg_complete_command(const char *text, int start, int end)
return matches;
cleanup:
- count--;
- while (count >= 0) {
- free(matches[count]);
- count--;
+ for (i = 0; i < count; i++) {
+ free(matches[i]);
}
free(matches);
return NULL;
--
2.16.2
>From 709fc718dbbef9a16df6cc8bc234555e84ffc6b2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 10:28:02 +0100
Subject: [PATCH 07/22] s4:client: Fix size types and loop
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source4/client/client.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/source4/client/client.c b/source4/client/client.c
index f73d9f99d20..284511fb58a 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3053,7 +3053,7 @@ static char **completion_fn(const char *text, int start, int end)
return NULL;
} else {
char **matches;
- int i, len, samelen = 0, count=1;
+ size_t i, len, samelen = 0, count=1;
matches = malloc_array_p(char *, MAX_COMPLETIONS);
if (!matches) return NULL;
@@ -3092,10 +3092,8 @@ static char **completion_fn(const char *text, int start, int end)
return matches;
cleanup:
- count--;
- while (count >= 0) {
- free(matches[count]);
- count--;
+ for (i = 0; i < count; i++) {
+ free(matches[i]);
}
free(matches);
return NULL;
--
2.16.2
>From 5b9bc8a127d754e352b326b03e61c72315c2e6a2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 13:02:26 +0100
Subject: [PATCH 08/22] heimdal: Fix size types and array access
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
.../heimdal/lib/gssapi/mech/gss_set_cred_option.c | 2 +-
source4/heimdal/lib/krb5/addr_families.c | 29 +++++++++++++---------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c b/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c
index d33453d92fe..653565b856d 100644
--- a/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c
+++ b/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c
@@ -41,7 +41,7 @@ gss_set_cred_option (OM_uint32 *minor_status,
struct _gss_cred *cred = (struct _gss_cred *) *cred_handle;
OM_uint32 major_status = GSS_S_COMPLETE;
struct _gss_mechanism_cred *mc;
- int one_ok = 0;
+ OM_uint32 one_ok = 0;
*minor_status = 0;
diff --git a/source4/heimdal/lib/krb5/addr_families.c b/source4/heimdal/lib/krb5/addr_families.c
index 5d321a7e917..1f7b7266608 100644
--- a/source4/heimdal/lib/krb5/addr_families.c
+++ b/source4/heimdal/lib/krb5/addr_families.c
@@ -803,7 +803,7 @@ static struct addr_operations at[] = {
}
};
-static int num_addrs = sizeof(at) / sizeof(at[0]);
+static size_t num_addrs = sizeof(at) / sizeof(at[0]);
static size_t max_sockaddr_size = 0;
@@ -814,22 +814,26 @@ static size_t max_sockaddr_size = 0;
static struct addr_operations *
find_af(int af)
{
- struct addr_operations *a;
+ size_t i;
- for (a = at; a < at + num_addrs; ++a)
- if (af == a->af)
- return a;
+ for (i = 0; i < num_addrs; i++) {
+ if (af == at[i].af) {
+ return &at[i];
+ }
+ }
return NULL;
}
static struct addr_operations *
find_atype(krb5_address_type atype)
{
- struct addr_operations *a;
+ size_t i;
- for (a = at; a < at + num_addrs; ++a)
- if (atype == a->atype)
- return a;
+ for (i = 0; i < num_addrs; i++) {
+ if (atype == at[i].atype) {
+ return &at[i];
+ }
+ }
return NULL;
}
@@ -949,10 +953,11 @@ KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
krb5_max_sockaddr_size (void)
{
if (max_sockaddr_size == 0) {
- struct addr_operations *a;
+ size_t i;
- for(a = at; a < at + num_addrs; ++a)
- max_sockaddr_size = max(max_sockaddr_size, a->max_sockaddr_size);
+ for (i = 0; i < num_addrs; i++) {
+ max_sockaddr_size = max(max_sockaddr_size, at[i].max_sockaddr_size);
+ }
}
return max_sockaddr_size;
}
--
2.16.2
>From c08d0d75f4d131ff7f54c59fd191e7d232890ff8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 21 Mar 2018 17:46:30 +0100
Subject: [PATCH 09/22] s4:torture: Fix size types in torture_create_procs()
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source4/torture/util_smb.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index fcbdc7a86ed..5ca816f7cde 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -593,11 +593,12 @@ double torture_create_procs(struct torture_context *tctx,
bool (*fn)(struct torture_context *, struct smbcli_state *, int),
bool *result)
{
- int i, status;
+ int status;
+ size_t i;
struct child_status *child_status;
- int synccount;
- int tries = 8;
- int torture_nprocs = torture_setting_int(tctx, "nprocs", 4);
+ size_t synccount;
+ size_t tries = 8;
+ size_t torture_nprocs = torture_setting_int(tctx, "nprocs", 4);
double start_time_limit = 10 + (torture_nprocs * 1.5);
struct timeval tv;
@@ -629,7 +630,7 @@ double torture_create_procs(struct torture_context *tctx,
pid_t mypid = getpid();
srandom(((int)mypid) ^ ((int)time(NULL)));
- if (asprintf(&myname, "CLIENT%d", i) == -1) {
+ if (asprintf(&myname, "CLIENT%zu", i) == -1) {
printf("asprintf failed\n");
return -1;
}
@@ -654,7 +655,7 @@ double torture_create_procs(struct torture_context *tctx,
if (!child_status[i].start) {
child_status[i].result = TORTURE_ERROR;
- printf("Child %d failed to start!\n", i);
+ printf("Child %zu failed to start!\n", i);
_exit(1);
}
@@ -671,14 +672,14 @@ double torture_create_procs(struct torture_context *tctx,
if (strlen(tctx->last_reason) > 1023) {
/* note: reason already contains \n */
torture_comment(tctx,
- "child %d (pid %u) failed: %s",
+ "child %zu (pid %u) failed: %s",
i,
(unsigned)child_status[i].pid,
tctx->last_reason);
}
snprintf(child_status[i].reason,
- 1024, "child %d (pid %u) failed: %s",
+ 1024, "child %zu (pid %u) failed: %s",
i, (unsigned)child_status[i].pid,
tctx->last_reason);
/* ensure proper "\n\0" termination: */
@@ -705,7 +706,7 @@ double torture_create_procs(struct torture_context *tctx,
} while (timeval_elapsed(&tv) < start_time_limit);
if (synccount != torture_nprocs) {
- printf("FAILED TO START %d CLIENTS (started %d)\n", torture_nprocs, synccount);
+ printf("FAILED TO START %zu CLIENTS (started %zu)\n", torture_nprocs, synccount);
/* cleanup child processes */
for (i = 0; i < torture_nprocs; i++) {
@@ -718,7 +719,7 @@ double torture_create_procs(struct torture_context *tctx,
return timeval_elapsed(&tv);
}
- printf("Starting %d clients\n", torture_nprocs);
+ printf("Starting %zu clients\n", torture_nprocs);
/* start the client load */
tv = timeval_current();
@@ -726,7 +727,7 @@ double torture_create_procs(struct torture_context *tctx,
child_status[i].start = true;
}
- printf("%d clients started\n", torture_nprocs);
+ printf("%zu clients started\n", torture_nprocs);
kill(0, SIGCONT);
--
2.16.2
>From 31a399485bb330f40415d903a8a32637d08b92a2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 11:49:18 +0100
Subject: [PATCH 10/22] s3:smbd: Fix size types in reply_negprot()
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/smbd/negprot.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index a36822e1907..27366ea0013 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -557,14 +557,15 @@ static const struct {
void reply_negprot(struct smb_request *req)
{
- int choice= -1;
+ size_t choice = 0;
int chosen_level = -1;
+ bool choice_set = false;
int protocol;
const char *p;
int protocols = 0;
int num_cliprotos;
char **cliprotos;
- int i;
+ size_t i;
size_t converted_size;
struct smbXsrv_connection *xconn = req->xconn;
struct smbd_server_connection *sconn = req->sconn;
@@ -733,14 +734,16 @@ void reply_negprot(struct smb_request *req)
if (strequal(cliprotos[i],supported_protocols[protocol].proto_name)) {
choice = i;
chosen_level = supported_protocols[protocol].protocol_level;
+ choice_set = true;
}
i++;
}
- if(choice != -1)
+ if (choice_set) {
break;
+ }
}
- if (choice == -1) {
+ if (!choice_set) {
bool ok;
DBG_NOTICE("No protocol supported !\n");
@@ -760,7 +763,7 @@ void reply_negprot(struct smb_request *req)
supported_protocols[protocol].proto_reply_fn(req, choice);
DEBUG(3,("Selected protocol %s\n",supported_protocols[protocol].proto_name));
- DEBUG( 5, ( "negprot index=%d\n", choice ) );
+ DBG_INFO("negprot index=%zu\n", choice);
/* We always have xconn->smb1.signing_state also for >= SMB2_02 */
signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state);
--
2.16.2
>From 7ddd5f92c5eee2b44ad953ea1d9d6080fe6808c8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 13:41:39 +0100
Subject: [PATCH 11/22] s3:printing: Fix size types
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/include/printing.h | 2 +-
source3/printing/printing.c | 27 +++++++++++++++++----------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/source3/include/printing.h b/source3/include/printing.h
index 07b86786f34..6fb730119f5 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -63,7 +63,7 @@ enum {LPSTAT_OK, LPSTAT_STOPPED, LPSTAT_ERROR};
typedef struct {
fstring message;
- int qcount;
+ size_t qcount;
int status;
} print_status_struct;
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index e4bb1d84f69..d8124686302 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -991,7 +991,7 @@ static void print_unix_job(struct tevent_context *ev,
struct traverse_struct {
print_queue_struct *queue;
- int qcount, snum, maxcount, total_jobs;
+ size_t qcount, snum, maxcount, total_jobs;
const char *sharename;
time_t lpq_time;
const char *lprm_command;
@@ -1010,7 +1010,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
struct traverse_struct *ts = (struct traverse_struct *)state;
struct printjob pjob;
uint32_t jobid;
- int i = 0;
+ size_t i = 0;
if ( key.dsize != sizeof(jobid) )
return 0;
@@ -1408,7 +1408,7 @@ static void print_queue_update_internal(struct tevent_context *ev,
struct printif *current_printif,
char *lpq_command, char *lprm_command)
{
- int i, qcount;
+ size_t i, qcount;
print_queue_struct *queue = NULL;
print_status_struct status;
print_status_struct old_status;
@@ -1443,8 +1443,10 @@ static void print_queue_update_internal(struct tevent_context *ev,
current_printif->type,
lpq_command, &queue, &status);
- DEBUG(3, ("print_queue_update_internal: %d job%s in queue for %s\n",
- qcount, (qcount != 1) ? "s" : "", sharename));
+ DBG_NOTICE("%zu job%s in queue for %s\n",
+ qcount,
+ (qcount != 1) ? "s" : "",
+ sharename);
/* Sort the queue by submission time otherwise they are displayed
in hash order. */
@@ -1519,15 +1521,20 @@ static void print_queue_update_internal(struct tevent_context *ev,
SAFE_FREE(tstruct.queue);
talloc_free(tmp_ctx);
- DEBUG(10,("print_queue_update_internal: printer %s INFO/total_jobs = %d\n",
- sharename, tstruct.total_jobs ));
+ DBG_DEBUG("printer %s INFO, total_jobs = %zu\n",
+ sharename,
+ tstruct.total_jobs);
tdb_store_int32(pdb->tdb, "INFO/total_jobs", tstruct.total_jobs);
get_queue_status(sharename, &old_status);
- if (old_status.qcount != qcount)
- DEBUG(10,("print_queue_update_internal: queue status change %d jobs -> %d jobs for printer %s\n",
- old_status.qcount, qcount, sharename));
+ if (old_status.qcount != qcount) {
+ DBG_DEBUG("Queue status change %zu jobs -> %zu jobs "
+ "for printer %s\n",
+ old_status.qcount,
+ qcount,
+ sharename);
+ }
/* store the new queue status structure */
slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", sharename);
--
2.16.2
>From c63d47b36f888699bb4f7e46cd57c2fc3326c50e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 14:06:34 +0100
Subject: [PATCH 12/22] s3:spoolss: Fix size types
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 2f42e6d4c39..9e492d5a396 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -5006,7 +5006,7 @@ static WERROR string_array_from_driver_info(TALLOC_CTX *mem_ctx,
const char *arch,
int version)
{
- int i;
+ size_t i;
size_t num_strings = 0;
const char **array = NULL;
--
2.16.2
>From 23336c4e28a3a2def4984446fe9784d8142e59f0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 14:51:28 +0100
Subject: [PATCH 13/22] s3:client: Fix size types
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/client/client.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/source3/client/client.c b/source3/client/client.c
index 49d027ad4ac..23ed02d9cc0 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -186,16 +186,20 @@ static bool yesno(const char *p)
number taken from the buffer. This may not equal the number written.
****************************************************************************/
-static int writefile(int f, char *b, int n)
+static ssize_t writefile(int f, char *b, size_t n)
{
- int i;
+ size_t i = 0;
+
+ if (n == 0) {
+ errno = EINVAL;
+ return -1;
+ }
if (!translation) {
return write(f,b,n);
}
- i = 0;
- while (i < n) {
+ do {
if (*b == '\r' && (i<(n-1)) && *(b+1) == '\n') {
b++;i++;
}
@@ -204,9 +208,9 @@ static int writefile(int f, char *b, int n)
}
b++;
i++;
- }
+ } while (i < n);
- return(i);
+ return (ssize_t)i;
}
/****************************************************************************
@@ -1092,7 +1096,10 @@ static int cmd_echo(void)
static NTSTATUS writefile_sink(char *buf, size_t n, void *priv)
{
int *pfd = (int *)priv;
- if (writefile(*pfd, buf, n) == -1) {
+ ssize_t rc;
+
+ rc = writefile(*pfd, buf, n);
+ if (rc == -1) {
return map_nt_error_from_unix(errno);
}
return NT_STATUS_OK;
@@ -5954,7 +5961,7 @@ static char **completion_fn(const char *text, int start, int end)
return NULL;
} else {
char **matches;
- int i, len, samelen = 0, count=1;
+ size_t i, len, samelen = 0, count=1;
matches = SMB_MALLOC_ARRAY(char *, MAX_COMPLETIONS);
if (!matches) {
--
2.16.2
>From 986e14278143de3b057bd8c45ae2c22fa0aa57a3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 22 Mar 2018 18:36:13 +0100
Subject: [PATCH 14/22] s3:torture: Fix size types in make_nonstd_fd()
This fixes compilation with -Wstrict-overflow=2.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/torture/wbc_async.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source3/torture/wbc_async.c b/source3/torture/wbc_async.c
index 1a7495acad8..a9020ddcda5 100644
--- a/source3/torture/wbc_async.c
+++ b/source3/torture/wbc_async.c
@@ -98,10 +98,10 @@ struct wb_context {
static int make_nonstd_fd(int fd)
{
- int i;
+ size_t i;
int sys_errno = 0;
int fds[3];
- int num_fds = 0;
+ size_t num_fds = 0;
if (fd == -1) {
return -1;
--
2.16.2
>From 3ebf011771e2a58689c7a48254d5422d059943e9 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 09:29:55 +0100
Subject: [PATCH 15/22] s3:modules: Update getdate.y to work with newer bison
versions
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
---
source3/modules/getdate.y | 243 +++++++++++++++++++++++-----------------------
1 file changed, 121 insertions(+), 122 deletions(-)
diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y
index 2e49f15b87f..3ac9f26abfc 100644
--- a/source3/modules/getdate.y
+++ b/source3/modules/getdate.y
@@ -105,7 +105,7 @@ typedef struct
enum { MERam, MERpm, MER24 };
/* Information passed to and from the parser. */
-typedef struct
+struct parser_control
{
/* The input string remaining to be parsed. */
const char *input;
@@ -151,16 +151,15 @@ typedef struct
/* Table of local time zone abbrevations, terminated by a null entry. */
table local_time_zone_table[3];
-} parser_control;
-
-#define PC (* (parser_control *) parm)
-#define YYLEX_PARAM parm
-#define YYPARSE_PARAM parm
+};
%}
+%lex-param {struct parser_control *pc}
+%parse-param {struct parser_control *pc}
+
/* We want a reentrant parser. */
-%pure_parser
+%pure-parser
/* This grammar has 13 shift/reduce conflicts. */
%expect 13
@@ -173,8 +172,8 @@ typedef struct
%{
-static int yyerror(const char *);
-static int yylex(YYSTYPE *, parser_control *);
+static int yyerror(struct parser_control *, const char *);
+static int yylex(YYSTYPE *, struct parser_control *);
%}
@@ -196,100 +195,100 @@ spec:
item:
time
- { PC.times_seen++; }
+ { pc->times_seen++; }
| local_zone
- { PC.local_zones_seen++; }
+ { pc->local_zones_seen++; }
| zone
- { PC.zones_seen++; }
+ { pc->zones_seen++; }
| date
- { PC.dates_seen++; }
+ { pc->dates_seen++; }
| day
- { PC.days_seen++; }
+ { pc->days_seen++; }
| rel
- { PC.rels_seen++; }
+ { pc->rels_seen++; }
| number
;
time:
tUNUMBER tMERIDIAN
{
- PC.hour = $1.value;
- PC.minutes = 0;
- PC.seconds = 0;
- PC.meridian = $2;
+ pc->hour = $1.value;
+ pc->minutes = 0;
+ pc->seconds = 0;
+ pc->meridian = $2;
}
| tUNUMBER ':' tUNUMBER o_merid
{
- PC.hour = $1.value;
- PC.minutes = $3.value;
- PC.seconds = 0;
- PC.meridian = $4;
+ pc->hour = $1.value;
+ pc->minutes = $3.value;
+ pc->seconds = 0;
+ pc->meridian = $4;
}
| tUNUMBER ':' tUNUMBER tSNUMBER
{
- PC.hour = $1.value;
- PC.minutes = $3.value;
- PC.meridian = MER24;
- PC.zones_seen++;
- PC.time_zone = $4.value % 100 + ($4.value / 100) * 60;
+ pc->hour = $1.value;
+ pc->minutes = $3.value;
+ pc->meridian = MER24;
+ pc->zones_seen++;
+ pc->time_zone = $4.value % 100 + ($4.value / 100) * 60;
}
| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid
{
- PC.hour = $1.value;
- PC.minutes = $3.value;
- PC.seconds = $5.value;
- PC.meridian = $6;
+ pc->hour = $1.value;
+ pc->minutes = $3.value;
+ pc->seconds = $5.value;
+ pc->meridian = $6;
}
| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER
{
- PC.hour = $1.value;
- PC.minutes = $3.value;
- PC.seconds = $5.value;
- PC.meridian = MER24;
- PC.zones_seen++;
- PC.time_zone = $6.value % 100 + ($6.value / 100) * 60;
+ pc->hour = $1.value;
+ pc->minutes = $3.value;
+ pc->seconds = $5.value;
+ pc->meridian = MER24;
+ pc->zones_seen++;
+ pc->time_zone = $6.value % 100 + ($6.value / 100) * 60;
}
;
local_zone:
tLOCAL_ZONE
- { PC.local_isdst = $1; }
+ { pc->local_isdst = $1; }
| tLOCAL_ZONE tDST
- { PC.local_isdst = $1 < 0 ? 1 : $1 + 1; }
+ { pc->local_isdst = $1 < 0 ? 1 : $1 + 1; }
;
zone:
tZONE
- { PC.time_zone = $1; }
+ { pc->time_zone = $1; }
| tDAYZONE
- { PC.time_zone = $1 + 60; }
+ { pc->time_zone = $1 + 60; }
| tZONE tDST
- { PC.time_zone = $1 + 60; }
+ { pc->time_zone = $1 + 60; }
;
day:
tDAY
{
- PC.day_ordinal = 1;
- PC.day_number = $1;
+ pc->day_ordinal = 1;
+ pc->day_number = $1;
}
| tDAY ','
{
- PC.day_ordinal = 1;
- PC.day_number = $1;
+ pc->day_ordinal = 1;
+ pc->day_number = $1;
}
| tUNUMBER tDAY
{
- PC.day_ordinal = $1.value;
- PC.day_number = $2;
+ pc->day_ordinal = $1.value;
+ pc->day_number = $2;
}
;
date:
tUNUMBER '/' tUNUMBER
{
- PC.month = $1.value;
- PC.day = $3.value;
+ pc->month = $1.value;
+ pc->day = $3.value;
}
| tUNUMBER '/' tUNUMBER '/' tUNUMBER
{
@@ -300,139 +299,139 @@ date:
you want portability, use the ISO 8601 format. */
if (4 <= $1.digits)
{
- PC.year = $1;
- PC.month = $3.value;
- PC.day = $5.value;
+ pc->year = $1;
+ pc->month = $3.value;
+ pc->day = $5.value;
}
else
{
- PC.month = $1.value;
- PC.day = $3.value;
- PC.year = $5;
+ pc->month = $1.value;
+ pc->day = $3.value;
+ pc->year = $5;
}
}
| tUNUMBER tSNUMBER tSNUMBER
{
/* ISO 8601 format. YYYY-MM-DD. */
- PC.year = $1;
- PC.month = -$2.value;
- PC.day = -$3.value;
+ pc->year = $1;
+ pc->month = -$2.value;
+ pc->day = -$3.value;
}
| tUNUMBER tMONTH tSNUMBER
{
/* e.g. 17-JUN-1992. */
- PC.day = $1.value;
- PC.month = $2;
- PC.year.value = -$3.value;
- PC.year.digits = $3.digits;
+ pc->day = $1.value;
+ pc->month = $2;
+ pc->year.value = -$3.value;
+ pc->year.digits = $3.digits;
}
| tMONTH tUNUMBER
{
- PC.month = $1;
- PC.day = $2.value;
+ pc->month = $1;
+ pc->day = $2.value;
}
| tMONTH tUNUMBER ',' tUNUMBER
{
- PC.month = $1;
- PC.day = $2.value;
- PC.year = $4;
+ pc->month = $1;
+ pc->day = $2.value;
+ pc->year = $4;
}
| tUNUMBER tMONTH
{
- PC.day = $1.value;
- PC.month = $2;
+ pc->day = $1.value;
+ pc->month = $2;
}
| tUNUMBER tMONTH tUNUMBER
{
- PC.day = $1.value;
- PC.month = $2;
- PC.year = $3;
+ pc->day = $1.value;
+ pc->month = $2;
+ pc->year = $3;
}
;
rel:
relunit tAGO
{
- PC.rel_seconds = -PC.rel_seconds;
- PC.rel_minutes = -PC.rel_minutes;
- PC.rel_hour = -PC.rel_hour;
- PC.rel_day = -PC.rel_day;
- PC.rel_month = -PC.rel_month;
- PC.rel_year = -PC.rel_year;
+ pc->rel_seconds = -pc->rel_seconds;
+ pc->rel_minutes = -pc->rel_minutes;
+ pc->rel_hour = -pc->rel_hour;
+ pc->rel_day = -pc->rel_day;
+ pc->rel_month = -pc->rel_month;
+ pc->rel_year = -pc->rel_year;
}
| relunit
;
relunit:
tUNUMBER tYEAR_UNIT
- { PC.rel_year += $1.value * $2; }
+ { pc->rel_year += $1.value * $2; }
| tSNUMBER tYEAR_UNIT
- { PC.rel_year += $1.value * $2; }
+ { pc->rel_year += $1.value * $2; }
| tYEAR_UNIT
- { PC.rel_year += $1; }
+ { pc->rel_year += $1; }
| tUNUMBER tMONTH_UNIT
- { PC.rel_month += $1.value * $2; }
+ { pc->rel_month += $1.value * $2; }
| tSNUMBER tMONTH_UNIT
- { PC.rel_month += $1.value * $2; }
+ { pc->rel_month += $1.value * $2; }
| tMONTH_UNIT
- { PC.rel_month += $1; }
+ { pc->rel_month += $1; }
| tUNUMBER tDAY_UNIT
- { PC.rel_day += $1.value * $2; }
+ { pc->rel_day += $1.value * $2; }
| tSNUMBER tDAY_UNIT
- { PC.rel_day += $1.value * $2; }
+ { pc->rel_day += $1.value * $2; }
| tDAY_UNIT
- { PC.rel_day += $1; }
+ { pc->rel_day += $1; }
| tUNUMBER tHOUR_UNIT
- { PC.rel_hour += $1.value * $2; }
+ { pc->rel_hour += $1.value * $2; }
| tSNUMBER tHOUR_UNIT
- { PC.rel_hour += $1.value * $2; }
+ { pc->rel_hour += $1.value * $2; }
| tHOUR_UNIT
- { PC.rel_hour += $1; }
+ { pc->rel_hour += $1; }
| tUNUMBER tMINUTE_UNIT
- { PC.rel_minutes += $1.value * $2; }
+ { pc->rel_minutes += $1.value * $2; }
| tSNUMBER tMINUTE_UNIT
- { PC.rel_minutes += $1.value * $2; }
+ { pc->rel_minutes += $1.value * $2; }
| tMINUTE_UNIT
- { PC.rel_minutes += $1; }
+ { pc->rel_minutes += $1; }
| tUNUMBER tSEC_UNIT
- { PC.rel_seconds += $1.value * $2; }
+ { pc->rel_seconds += $1.value * $2; }
| tSNUMBER tSEC_UNIT
- { PC.rel_seconds += $1.value * $2; }
+ { pc->rel_seconds += $1.value * $2; }
| tSEC_UNIT
- { PC.rel_seconds += $1; }
+ { pc->rel_seconds += $1; }
;
number:
tUNUMBER
{
- if (PC.dates_seen
- && ! PC.rels_seen && (PC.times_seen || 2 < $1.digits))
- PC.year = $1;
+ if (pc->dates_seen
+ && ! pc->rels_seen && (pc->times_seen || 2 < $1.digits))
+ pc->year = $1;
else
{
if (4 < $1.digits)
{
- PC.dates_seen++;
- PC.day = $1.value % 100;
- PC.month = ($1.value / 100) % 100;
- PC.year.value = $1.value / 10000;
- PC.year.digits = $1.digits - 4;
+ pc->dates_seen++;
+ pc->day = $1.value % 100;
+ pc->month = ($1.value / 100) % 100;
+ pc->year.value = $1.value / 10000;
+ pc->year.digits = $1.digits - 4;
}
else
{
- PC.times_seen++;
+ pc->times_seen++;
if ($1.digits <= 2)
{
- PC.hour = $1.value;
- PC.minutes = 0;
+ pc->hour = $1.value;
+ pc->minutes = 0;
}
else
{
- PC.hour = $1.value / 100;
- PC.minutes = $1.value % 100;
+ pc->hour = $1.value / 100;
+ pc->minutes = $1.value % 100;
}
- PC.seconds = 0;
- PC.meridian = MER24;
+ pc->seconds = 0;
+ pc->meridian = MER24;
}
}
}
@@ -674,7 +673,7 @@ to_year (textint textyear)
}
static table const *
-lookup_zone (parser_control const *pc, char const *name)
+lookup_zone (struct parser_control const *pc, char const *name)
{
table const *tp;
@@ -718,7 +717,7 @@ tm_diff (struct tm const *a, struct tm const *b)
#endif /* ! HAVE_TM_GMTOFF */
static table const *
-lookup_word (parser_control const *pc, char *word)
+lookup_word (struct parser_control const *pc, char *word)
{
char *p;
char *q;
@@ -787,7 +786,7 @@ lookup_word (parser_control const *pc, char *word)
}
static int
-yylex (YYSTYPE *lvalp, parser_control *pc)
+yylex (YYSTYPE *lvalp, struct parser_control *pc)
{
unsigned char c;
size_t count;
@@ -829,18 +828,18 @@ yylex (YYSTYPE *lvalp, parser_control *pc)
if (ISALPHA (c))
{
char buff[20];
- char *p = buff;
+ size_t i = 0;
table const *tp;
do
{
- if (p < buff + sizeof buff - 1)
- *p++ = c;
+ if (i < 20)
+ buff[i++] = c;
c = *++pc->input;
}
while (ISALPHA (c) || c == '.');
- *p = '\0';
+ buff[i] = '\0';
tp = lookup_word (pc, buff);
if (! tp)
return '?';
@@ -867,7 +866,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc)
/* Do nothing if the parser reports an error. */
static int
-yyerror (const char *s ATTRIBUTE_UNUSED)
+yyerror (struct parser_control *pc ATTRIBUTE_UNUSED, const char *s ATTRIBUTE_UNUSED)
{
return 0;
}
@@ -883,7 +882,7 @@ get_date (const char *p, const time_t *now)
struct tm *tmp = localtime (&Start);
struct tm tm;
struct tm tm0;
- parser_control pc;
+ struct parser_control pc;
if (! tmp)
return -1;
--
2.16.2
>From a99ea1cb677aab73abf064bb15d2c0bc59c1b97c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 09:30:27 +0100
Subject: [PATCH 16/22] s3:modules: Generate new getdate.c with bison
bison -o source3/modules/getdate.c source3/modules/getdate.y<Paste>
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
---
source3/modules/getdate.c | 1874 ++++++++++++++++++++++-----------------------
1 file changed, 897 insertions(+), 977 deletions(-)
diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c
index 7a5d68ee6a3..ccc9b10e6f7 100644
--- a/source3/modules/getdate.c
+++ b/source3/modules/getdate.c
@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3. */
+/* A Bison parser, made by GNU Bison 3.0.4. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +15,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -47,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "3.0.4"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -55,58 +52,17 @@
/* Pure parsers. */
#define YYPURE 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
+/* Push parsers. */
+#define YYPUSH 0
-
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- tAGO = 258,
- tDST = 259,
- tDAY = 260,
- tDAY_UNIT = 261,
- tDAYZONE = 262,
- tHOUR_UNIT = 263,
- tLOCAL_ZONE = 264,
- tMERIDIAN = 265,
- tMINUTE_UNIT = 266,
- tMONTH = 267,
- tMONTH_UNIT = 268,
- tSEC_UNIT = 269,
- tYEAR_UNIT = 270,
- tZONE = 271,
- tSNUMBER = 272,
- tUNUMBER = 273
- };
-#endif
-/* Tokens. */
-#define tAGO 258
-#define tDST 259
-#define tDAY 260
-#define tDAY_UNIT 261
-#define tDAYZONE 262
-#define tHOUR_UNIT 263
-#define tLOCAL_ZONE 264
-#define tMERIDIAN 265
-#define tMINUTE_UNIT 266
-#define tMONTH 267
-#define tMONTH_UNIT 268
-#define tSEC_UNIT 269
-#define tYEAR_UNIT 270
-#define tZONE 271
-#define tSNUMBER 272
-#define tUNUMBER 273
+/* Pull parsers. */
+#define YYPULL 1
/* Copy the first part of user declarations. */
-#line 1 "getdate.y"
+#line 1 "source3/modules/getdate.y" /* yacc.c:339 */
/* Parse a string into an internal time stamp.
Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
@@ -214,7 +170,7 @@ typedef struct
enum { MERam, MERpm, MER24 };
/* Information passed to and from the parser. */
-typedef struct
+struct parser_control
{
/* The input string remaining to be parsed. */
const char *input;
@@ -260,18 +216,18 @@ typedef struct
/* Table of local time zone abbrevations, terminated by a null entry. */
table local_time_zone_table[3];
-} parser_control;
-
-#define PC (* (parser_control *) parm)
-#define YYLEX_PARAM parm
-#define YYPARSE_PARAM parm
+};
+#line 223 "source3/modules/getdate.c" /* yacc.c:339 */
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+# ifndef YY_NULLPTR
+# if defined __cplusplus && 201103L <= __cplusplus
+# define YY_NULLPTR nullptr
+# else
+# define YY_NULLPTR 0
+# endif
+# endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
@@ -281,39 +237,72 @@ typedef struct
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+
+/* Debug traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ enum yytokentype
+ {
+ tAGO = 258,
+ tDST = 259,
+ tDAY = 260,
+ tDAY_UNIT = 261,
+ tDAYZONE = 262,
+ tHOUR_UNIT = 263,
+ tLOCAL_ZONE = 264,
+ tMERIDIAN = 265,
+ tMINUTE_UNIT = 266,
+ tMONTH = 267,
+ tMONTH_UNIT = 268,
+ tSEC_UNIT = 269,
+ tYEAR_UNIT = 270,
+ tZONE = 271,
+ tSNUMBER = 272,
+ tUNUMBER = 273
+ };
#endif
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 169 "getdate.y"
+
+union YYSTYPE
{
+#line 168 "source3/modules/getdate.y" /* yacc.c:355 */
+
int intval;
textint textintval;
-}
-/* Line 187 of yacc.c. */
-#line 298 "getdate.c"
- YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 284 "source3/modules/getdate.c" /* yacc.c:355 */
+};
+
+typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
#endif
-/* Copy the second part of user declarations. */
-#line 174 "getdate.y"
+int yyparse (struct parser_control *pc);
+
-static int yyerror(const char *);
-static int yylex(YYSTYPE *, parser_control *);
+/* Copy the second part of user declarations. */
+#line 173 "source3/modules/getdate.y" /* yacc.c:358 */
+static int yyerror(struct parser_control *, const char *);
+static int yylex(YYSTYPE *, struct parser_control *);
-/* Line 216 of yacc.c. */
-#line 317 "getdate.c"
+
+#line 306 "source3/modules/getdate.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -327,11 +316,8 @@ typedef unsigned char yytype_uint8;
#ifdef YYTYPE_INT8
typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
#else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
#endif
#ifdef YYTYPE_UINT16
@@ -351,8 +337,7 @@ typedef short int yytype_int16;
# define YYSIZE_T __SIZE_TYPE__
# elif defined size_t
# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
@@ -363,42 +348,71 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# define YY_(Msgid) dgettext ("bison-runtime", Msgid)
# endif
# endif
# ifndef YY_
-# define YY_(msgid) msgid
+# define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__ \
+ && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \
+ || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+# define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+# define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+ && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+# define _Noreturn __declspec (noreturn)
+# else
+# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
# endif
#endif
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
#else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
#endif
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized. */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+ _Pragma ("GCC diagnostic pop")
#else
-static int
-YYID (i)
- int i;
+# define YY_INITIAL_VALUE(Value) Value
#endif
-{
- return i;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
#endif
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -416,11 +430,11 @@ YYID (i)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+ /* Use EXIT_SUCCESS as a witness for stdlib.h. */
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -428,8 +442,8 @@ YYID (i)
# endif
# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+ /* Pacify GCC's 'empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# ifndef YYSTACK_ALLOC_MAXIMUM
/* The OS might guarantee only one guard page at the bottom of the stack,
and a page size can be as small as 4096 bytes. So we cannot safely
@@ -443,25 +457,23 @@ YYID (i)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined malloc && ! defined EXIT_SUCCESS
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined free && ! defined EXIT_SUCCESS
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
@@ -471,14 +483,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss;
- YYSTYPE yyvs;
- };
+ yytype_int16 yyss_alloc;
+ YYSTYPE yyvs_alloc;
+};
/* The size of the maximum gap between one aligned stack and the next. */
# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -489,42 +501,46 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
- while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (0)
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(Dst, Src, Count) \
+ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+# else
+# define YYCOPY(Dst, Src, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (Dst)[yyi] = (Src)[yyi]; \
+ } \
+ while (0)
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
@@ -536,17 +552,19 @@ union yyalloc
#define YYNNTS 12
/* YYNRULES -- Number of rules. */
#define YYNRULES 54
-/* YYNRULES -- Number of states. */
+/* YYNSTATES -- Number of states. */
#define YYNSTATES 64
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+ by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 273
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, without out-of-bounds checking. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -580,52 +598,19 @@ static const yytype_uint8 yytranslate[] =
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint8 yyprhs[] =
-{
- 0, 0, 3, 4, 7, 9, 11, 13, 15, 17,
- 19, 21, 24, 29, 34, 41, 48, 50, 53, 55,
- 57, 60, 62, 65, 68, 72, 78, 82, 86, 89,
- 94, 97, 101, 104, 106, 109, 112, 114, 117, 120,
- 122, 125, 128, 130, 133, 136, 138, 141, 144, 146,
- 149, 152, 154, 156, 157
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs[] =
-{
- 23, 0, -1, -1, 23, 24, -1, 25, -1, 26,
- -1, 27, -1, 29, -1, 28, -1, 30, -1, 32,
- -1, 18, 10, -1, 18, 19, 18, 33, -1, 18,
- 19, 18, 17, -1, 18, 19, 18, 19, 18, 33,
- -1, 18, 19, 18, 19, 18, 17, -1, 9, -1,
- 9, 4, -1, 16, -1, 7, -1, 16, 4, -1,
- 5, -1, 5, 20, -1, 18, 5, -1, 18, 21,
- 18, -1, 18, 21, 18, 21, 18, -1, 18, 17,
- 17, -1, 18, 12, 17, -1, 12, 18, -1, 12,
- 18, 20, 18, -1, 18, 12, -1, 18, 12, 18,
- -1, 31, 3, -1, 31, -1, 18, 15, -1, 17,
- 15, -1, 15, -1, 18, 13, -1, 17, 13, -1,
- 13, -1, 18, 6, -1, 17, 6, -1, 6, -1,
- 18, 8, -1, 17, 8, -1, 8, -1, 18, 11,
- -1, 17, 11, -1, 11, -1, 18, 14, -1, 17,
- 14, -1, 14, -1, 18, -1, -1, 10, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 192, 192, 194, 198, 200, 202, 204, 206, 208,
- 210, 214, 221, 228, 236, 243, 255, 257, 262, 264,
- 266, 271, 276, 281, 289, 294, 314, 321, 329, 334,
- 340, 345, 354, 363, 367, 369, 371, 373, 375, 377,
- 379, 381, 383, 385, 387, 389, 391, 393, 395, 397,
- 399, 401, 406, 443, 444
+ 0, 191, 191, 193, 197, 199, 201, 203, 205, 207,
+ 209, 213, 220, 227, 235, 242, 254, 256, 261, 263,
+ 265, 270, 275, 280, 288, 293, 313, 320, 328, 333,
+ 339, 344, 353, 362, 366, 368, 370, 372, 374, 376,
+ 378, 380, 382, 384, 386, 388, 390, 392, 394, 396,
+ 398, 400, 405, 442, 443
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -635,13 +620,13 @@ static const char *const yytname[] =
"tMONTH", "tMONTH_UNIT", "tSEC_UNIT", "tYEAR_UNIT", "tZONE", "tSNUMBER",
"tUNUMBER", "':'", "','", "'/'", "$accept", "spec", "item", "time",
"local_zone", "zone", "day", "date", "rel", "relunit", "number",
- "o_merid", 0
+ "o_merid", YY_NULLPTR
};
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
@@ -650,31 +635,32 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
-{
- 0, 22, 23, 23, 24, 24, 24, 24, 24, 24,
- 24, 25, 25, 25, 25, 25, 26, 26, 27, 27,
- 27, 28, 28, 28, 29, 29, 29, 29, 29, 29,
- 29, 29, 30, 30, 31, 31, 31, 31, 31, 31,
- 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
- 31, 31, 32, 33, 33
-};
+#define YYPACT_NINF -17
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+ (!!((Yystate) == (-17)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+ 0
+
+ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+static const yytype_int8 yypact[] =
{
- 0, 2, 0, 2, 1, 1, 1, 1, 1, 1,
- 1, 2, 4, 4, 6, 6, 1, 2, 1, 1,
- 2, 1, 2, 2, 3, 5, 3, 3, 2, 4,
- 2, 3, 2, 1, 2, 2, 1, 2, 2, 1,
- 2, 2, 1, 2, 2, 1, 2, 2, 1, 2,
- 2, 1, 1, 0, 1
+ -17, 0, -17, 1, -17, -17, -17, 19, -17, -14,
+ -17, -17, -17, 32, 26, 14, -17, -17, -17, -17,
+ -17, -17, -17, 27, -17, -17, -17, 22, -17, -17,
+ -17, -17, -17, -17, -17, -17, -17, -17, -17, -17,
+ -16, -17, -17, -17, 29, 25, 30, -17, 31, -17,
+ -17, -17, 28, 23, -17, -17, -17, 33, -17, 34,
+ -7, -17, -17, -17
};
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
+ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE does not specify something else to do. Zero
+ means the default is an error. */
static const yytype_uint8 yydefact[] =
{
2, 0, 1, 21, 42, 19, 45, 16, 48, 0,
@@ -686,39 +672,23 @@ static const yytype_uint8 yydefact[] =
53, 25, 15, 14
};
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int8 yydefgoto[] =
-{
- -1, 1, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 58
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -17
-static const yytype_int8 yypact[] =
+ /* YYPGOTO[NTERM-NUM]. */
+static const yytype_int8 yypgoto[] =
{
- -17, 0, -17, 1, -17, -17, -17, 19, -17, -14,
- -17, -17, -17, 32, 26, 14, -17, -17, -17, -17,
- -17, -17, -17, 27, -17, -17, -17, 22, -17, -17,
-17, -17, -17, -17, -17, -17, -17, -17, -17, -17,
- -16, -17, -17, -17, 29, 25, 30, -17, 31, -17,
- -17, -17, 28, 23, -17, -17, -17, 33, -17, 34,
- -7, -17, -17, -17
+ -17, -10
};
-/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int8 yypgoto[] =
+ /* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int8 yydefgoto[] =
{
- -17, -17, -17, -17, -17, -17, -17, -17, -17, -17,
- -17, -10
+ -1, 1, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 58
};
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -1
+ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule whose
+ number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_uint8 yytable[] =
{
2, 49, 50, 55, 27, 3, 4, 5, 6, 7,
@@ -739,8 +709,8 @@ static const yytype_uint8 yycheck[] =
60, 18, 18
};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
+ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
0, 23, 0, 5, 6, 7, 8, 9, 11, 12,
@@ -752,95 +722,63 @@ static const yytype_uint8 yystos[] =
18, 18, 17, 33
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint8 yyr1[] =
+{
+ 0, 22, 23, 23, 24, 24, 24, 24, 24, 24,
+ 24, 25, 25, 25, 25, 25, 26, 26, 27, 27,
+ 27, 28, 28, 28, 29, 29, 29, 29, 29, 29,
+ 29, 29, 30, 30, 31, 31, 31, 31, 31, 31,
+ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+ 31, 31, 32, 33, 33
+};
-#define YYFAIL goto yyerrlab
+ /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
+static const yytype_uint8 yyr2[] =
+{
+ 0, 2, 0, 2, 1, 1, 1, 1, 1, 1,
+ 1, 2, 4, 4, 6, 6, 1, 2, 1, 1,
+ 2, 1, 2, 2, 3, 5, 3, 3, 2, 4,
+ 2, 3, 2, 1, 2, 2, 1, 2, 2, 1,
+ 2, 2, 1, 2, 2, 1, 2, 2, 1, 2,
+ 2, 1, 1, 0, 1
+};
-#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (YYID (0))
-
-
-#define YYTERROR 1
-#define YYERRCODE 256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS[0] (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
- while (YYID (0))
-#endif
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
+#define YYRECOVERING() (!!yyerrstatus)
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror (pc, YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+while (0)
+
+/* Error token number */
+#define YYTERROR 1
+#define YYERRCODE 256
-/* YYLEX -- calling `yylex' with the right arguments. */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
/* Enable debugging if requested. */
#if YYDEBUG
@@ -850,54 +788,47 @@ while (YYID (0))
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
-} while (YYID (0))
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (0)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value, pc); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT. |
+`----------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parser_control *pc)
{
+ FILE *yyo = yyoutput;
+ YYUSE (yyo);
+ YYUSE (pc);
if (!yyvaluep)
return;
# ifdef YYPRINT
if (yytype < YYNTOKENS)
YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
- YYUSE (yyoutput);
# endif
- switch (yytype)
- {
- default:
- break;
- }
+ YYUSE (yytype);
}
@@ -905,24 +836,13 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
| Print this symbol on YYOUTPUT. |
`--------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parser_control *pc)
{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+ YYFPRINTF (yyoutput, "%s %s (",
+ yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+ yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc);
YYFPRINTF (yyoutput, ")");
}
@@ -931,66 +851,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
| TOP (included). |
`------------------------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
static void
-yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
-#endif
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
{
YYFPRINTF (stderr, "Stack now");
- for (; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (0)
/*------------------------------------------------.
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
- int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, struct parser_control *pc)
{
+ unsigned long int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- fprintf (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- );
- fprintf (stderr, "\n");
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ , pc);
+ YYFPRINTF (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyssp, yyvsp, Rule, pc); \
+} while (0)
/* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */
@@ -1004,7 +912,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -1019,7 +927,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
@@ -1028,15 +935,8 @@ int yydebug;
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static YYSIZE_T
yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
{
YYSIZE_T yylen;
for (yylen = 0; yystr[yylen]; yylen++)
@@ -1052,16 +952,8 @@ yystrlen (yystr)
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static char *
yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
{
char *yyd = yydest;
const char *yys = yysrc;
@@ -1091,28 +983,27 @@ yytnamerr (char *yyres, const char *yystr)
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\') {
- goto do_not_strip_quotes;
- }
- FALL_THROUGH;
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
@@ -1123,165 +1014,159 @@ yytnamerr (char *yyres, const char *yystr)
}
# endif
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
- int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+{
+ YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = YY_NULLPTR;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
{
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ int yyn = yypact[*yyssp];
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ {
+ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
+ }
+ }
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ {
+ YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
- if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
- return yysize;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
}
+
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ {
+ char *yyp = *yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
`-----------------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct parser_control *pc)
{
YYUSE (yyvaluep);
-
+ YYUSE (pc);
if (!yymsg)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
- switch (yytype)
- {
-
- default:
- break;
- }
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+ YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
-
-
-/* Prevent warnings from -Wmissing-prototypes. */
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
@@ -1290,99 +1175,76 @@ int yyparse ();
| yyparse. |
`----------*/
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
+yyparse (struct parser_control *pc)
{
- /* The look-ahead symbol. */
+/* The lookahead symbol. */
int yychar;
-/* The semantic value of the look-ahead symbol. */
-YYSTYPE yylval;
-/* Number of syntax errors so far. */
-int yynerrs;
+/* The semantic value of the lookahead symbol. */
+/* Default value used for initialization, for pacifying older GCCs
+ or non-GCC compilers. */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
- int yystate;
- int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
- int yytoken = 0;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ /* Number of syntax errors so far. */
+ int yynerrs;
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ /* The stacks and their tools:
+ 'yyss': related to states.
+ 'yyvs': related to semantic values.
+ Refer to the stacks through separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYSIZE_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken = 0;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
+ yyssp = yyss = yyssa;
+ yyvsp = yyvs = yyvsa;
+ yystacksize = YYINITDEPTH;
+
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
-
- yyssp = yyss;
- yyvsp = yyvs;
-
+ yychar = YYEMPTY; /* Cause a token to be read. */
goto yysetstate;
/*------------------------------------------------------------.
@@ -1403,25 +1265,23 @@ int yynerrs;
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
-
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
-
- &yystacksize);
-
- yyss = yyss1;
- yyvs = yyvs1;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yystacksize);
+
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1429,23 +1289,22 @@ int yynerrs;
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -1453,16 +1312,18 @@ int yynerrs;
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
-
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -1471,20 +1332,20 @@ int yynerrs;
yybackup:
/* Do appropriate processing given the current state. Read a
- look-ahead token if we need one and don't already have one. */
+ lookahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to look-ahead token. */
+ /* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
- /* Not known => get a look-ahead token if don't already have one. */
+ /* Not known => get a lookahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
+ yychar = yylex (&yylval, pc);
}
if (yychar <= YYEOF)
@@ -1506,29 +1367,27 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ if (yytable_value_is_error (yyn))
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the look-ahead token. */
+ /* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
yystate = yyn;
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
goto yynewstate;
@@ -1551,7 +1410,7 @@ yyreduce:
yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
+ '$$ = $1'.
Otherwise, the following line sets YYVAL to garbage.
This behavior is undocumented and Bison
@@ -1565,376 +1424,435 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 199 "getdate.y"
- { PC.times_seen++; ;}
+#line 198 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->times_seen++; }
+#line 1430 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 5:
-#line 201 "getdate.y"
- { PC.local_zones_seen++; ;}
+#line 200 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->local_zones_seen++; }
+#line 1436 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 6:
-#line 203 "getdate.y"
- { PC.zones_seen++; ;}
+#line 202 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->zones_seen++; }
+#line 1442 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 7:
-#line 205 "getdate.y"
- { PC.dates_seen++; ;}
+#line 204 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->dates_seen++; }
+#line 1448 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 8:
-#line 207 "getdate.y"
- { PC.days_seen++; ;}
+#line 206 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->days_seen++; }
+#line 1454 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 9:
-#line 209 "getdate.y"
- { PC.rels_seen++; ;}
+#line 208 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rels_seen++; }
+#line 1460 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 11:
-#line 215 "getdate.y"
+#line 214 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.hour = (yyvsp[(1) - (2)].textintval).value;
- PC.minutes = 0;
- PC.seconds = 0;
- PC.meridian = (yyvsp[(2) - (2)].intval);
- ;}
+ pc->hour = (yyvsp[-1].textintval).value;
+ pc->minutes = 0;
+ pc->seconds = 0;
+ pc->meridian = (yyvsp[0].intval);
+ }
+#line 1471 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 12:
-#line 222 "getdate.y"
+#line 221 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.hour = (yyvsp[(1) - (4)].textintval).value;
- PC.minutes = (yyvsp[(3) - (4)].textintval).value;
- PC.seconds = 0;
- PC.meridian = (yyvsp[(4) - (4)].intval);
- ;}
+ pc->hour = (yyvsp[-3].textintval).value;
+ pc->minutes = (yyvsp[-1].textintval).value;
+ pc->seconds = 0;
+ pc->meridian = (yyvsp[0].intval);
+ }
+#line 1482 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 13:
-#line 229 "getdate.y"
+#line 228 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.hour = (yyvsp[(1) - (4)].textintval).value;
- PC.minutes = (yyvsp[(3) - (4)].textintval).value;
- PC.meridian = MER24;
- PC.zones_seen++;
- PC.time_zone = (yyvsp[(4) - (4)].textintval).value % 100 + ((yyvsp[(4) - (4)].textintval).value / 100) * 60;
- ;}
+ pc->hour = (yyvsp[-3].textintval).value;
+ pc->minutes = (yyvsp[-1].textintval).value;
+ pc->meridian = MER24;
+ pc->zones_seen++;
+ pc->time_zone = (yyvsp[0].textintval).value % 100 + ((yyvsp[0].textintval).value / 100) * 60;
+ }
+#line 1494 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 14:
-#line 237 "getdate.y"
+#line 236 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.hour = (yyvsp[(1) - (6)].textintval).value;
- PC.minutes = (yyvsp[(3) - (6)].textintval).value;
- PC.seconds = (yyvsp[(5) - (6)].textintval).value;
- PC.meridian = (yyvsp[(6) - (6)].intval);
- ;}
+ pc->hour = (yyvsp[-5].textintval).value;
+ pc->minutes = (yyvsp[-3].textintval).value;
+ pc->seconds = (yyvsp[-1].textintval).value;
+ pc->meridian = (yyvsp[0].intval);
+ }
+#line 1505 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 15:
-#line 244 "getdate.y"
+#line 243 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.hour = (yyvsp[(1) - (6)].textintval).value;
- PC.minutes = (yyvsp[(3) - (6)].textintval).value;
- PC.seconds = (yyvsp[(5) - (6)].textintval).value;
- PC.meridian = MER24;
- PC.zones_seen++;
- PC.time_zone = (yyvsp[(6) - (6)].textintval).value % 100 + ((yyvsp[(6) - (6)].textintval).value / 100) * 60;
- ;}
+ pc->hour = (yyvsp[-5].textintval).value;
+ pc->minutes = (yyvsp[-3].textintval).value;
+ pc->seconds = (yyvsp[-1].textintval).value;
+ pc->meridian = MER24;
+ pc->zones_seen++;
+ pc->time_zone = (yyvsp[0].textintval).value % 100 + ((yyvsp[0].textintval).value / 100) * 60;
+ }
+#line 1518 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 16:
-#line 256 "getdate.y"
- { PC.local_isdst = (yyvsp[(1) - (1)].intval); ;}
+#line 255 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->local_isdst = (yyvsp[0].intval); }
+#line 1524 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 17:
-#line 258 "getdate.y"
- { PC.local_isdst = (yyvsp[(1) - (2)].intval) < 0 ? 1 : (yyvsp[(1) - (2)].intval) + 1; ;}
+#line 257 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->local_isdst = (yyvsp[-1].intval) < 0 ? 1 : (yyvsp[-1].intval) + 1; }
+#line 1530 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 18:
-#line 263 "getdate.y"
- { PC.time_zone = (yyvsp[(1) - (1)].intval); ;}
+#line 262 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->time_zone = (yyvsp[0].intval); }
+#line 1536 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 19:
-#line 265 "getdate.y"
- { PC.time_zone = (yyvsp[(1) - (1)].intval) + 60; ;}
+#line 264 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->time_zone = (yyvsp[0].intval) + 60; }
+#line 1542 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 20:
-#line 267 "getdate.y"
- { PC.time_zone = (yyvsp[(1) - (2)].intval) + 60; ;}
+#line 266 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->time_zone = (yyvsp[-1].intval) + 60; }
+#line 1548 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 21:
-#line 272 "getdate.y"
+#line 271 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.day_ordinal = 1;
- PC.day_number = (yyvsp[(1) - (1)].intval);
- ;}
+ pc->day_ordinal = 1;
+ pc->day_number = (yyvsp[0].intval);
+ }
+#line 1557 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 22:
-#line 277 "getdate.y"
+#line 276 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.day_ordinal = 1;
- PC.day_number = (yyvsp[(1) - (2)].intval);
- ;}
+ pc->day_ordinal = 1;
+ pc->day_number = (yyvsp[-1].intval);
+ }
+#line 1566 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 23:
-#line 282 "getdate.y"
+#line 281 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.day_ordinal = (yyvsp[(1) - (2)].textintval).value;
- PC.day_number = (yyvsp[(2) - (2)].intval);
- ;}
+ pc->day_ordinal = (yyvsp[-1].textintval).value;
+ pc->day_number = (yyvsp[0].intval);
+ }
+#line 1575 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 24:
-#line 290 "getdate.y"
+#line 289 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.month = (yyvsp[(1) - (3)].textintval).value;
- PC.day = (yyvsp[(3) - (3)].textintval).value;
- ;}
+ pc->month = (yyvsp[-2].textintval).value;
+ pc->day = (yyvsp[0].textintval).value;
+ }
+#line 1584 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 25:
-#line 295 "getdate.y"
+#line 294 "source3/modules/getdate.y" /* yacc.c:1646 */
{
/* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
otherwise as MM/DD/YY.
The goal in recognizing YYYY/MM/DD is solely to support legacy
machine-generated dates like those in an RCS log listing. If
you want portability, use the ISO 8601 format. */
- if (4 <= (yyvsp[(1) - (5)].textintval).digits)
+ if (4 <= (yyvsp[-4].textintval).digits)
{
- PC.year = (yyvsp[(1) - (5)].textintval);
- PC.month = (yyvsp[(3) - (5)].textintval).value;
- PC.day = (yyvsp[(5) - (5)].textintval).value;
+ pc->year = (yyvsp[-4].textintval);
+ pc->month = (yyvsp[-2].textintval).value;
+ pc->day = (yyvsp[0].textintval).value;
}
else
{
- PC.month = (yyvsp[(1) - (5)].textintval).value;
- PC.day = (yyvsp[(3) - (5)].textintval).value;
- PC.year = (yyvsp[(5) - (5)].textintval);
+ pc->month = (yyvsp[-4].textintval).value;
+ pc->day = (yyvsp[-2].textintval).value;
+ pc->year = (yyvsp[0].textintval);
}
- ;}
+ }
+#line 1608 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 26:
-#line 315 "getdate.y"
+#line 314 "source3/modules/getdate.y" /* yacc.c:1646 */
{
/* ISO 8601 format. YYYY-MM-DD. */
- PC.year = (yyvsp[(1) - (3)].textintval);
- PC.month = -(yyvsp[(2) - (3)].textintval).value;
- PC.day = -(yyvsp[(3) - (3)].textintval).value;
- ;}
+ pc->year = (yyvsp[-2].textintval);
+ pc->month = -(yyvsp[-1].textintval).value;
+ pc->day = -(yyvsp[0].textintval).value;
+ }
+#line 1619 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 27:
-#line 322 "getdate.y"
+#line 321 "source3/modules/getdate.y" /* yacc.c:1646 */
{
/* e.g. 17-JUN-1992. */
- PC.day = (yyvsp[(1) - (3)].textintval).value;
- PC.month = (yyvsp[(2) - (3)].intval);
- PC.year.value = -(yyvsp[(3) - (3)].textintval).value;
- PC.year.digits = (yyvsp[(3) - (3)].textintval).digits;
- ;}
+ pc->day = (yyvsp[-2].textintval).value;
+ pc->month = (yyvsp[-1].intval);
+ pc->year.value = -(yyvsp[0].textintval).value;
+ pc->year.digits = (yyvsp[0].textintval).digits;
+ }
+#line 1631 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 28:
-#line 330 "getdate.y"
+#line 329 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.month = (yyvsp[(1) - (2)].intval);
- PC.day = (yyvsp[(2) - (2)].textintval).value;
- ;}
+ pc->month = (yyvsp[-1].intval);
+ pc->day = (yyvsp[0].textintval).value;
+ }
+#line 1640 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 29:
-#line 335 "getdate.y"
+#line 334 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.month = (yyvsp[(1) - (4)].intval);
- PC.day = (yyvsp[(2) - (4)].textintval).value;
- PC.year = (yyvsp[(4) - (4)].textintval);
- ;}
+ pc->month = (yyvsp[-3].intval);
+ pc->day = (yyvsp[-2].textintval).value;
+ pc->year = (yyvsp[0].textintval);
+ }
+#line 1650 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 30:
-#line 341 "getdate.y"
+#line 340 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.day = (yyvsp[(1) - (2)].textintval).value;
- PC.month = (yyvsp[(2) - (2)].intval);
- ;}
+ pc->day = (yyvsp[-1].textintval).value;
+ pc->month = (yyvsp[0].intval);
+ }
+#line 1659 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 31:
-#line 346 "getdate.y"
+#line 345 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.day = (yyvsp[(1) - (3)].textintval).value;
- PC.month = (yyvsp[(2) - (3)].intval);
- PC.year = (yyvsp[(3) - (3)].textintval);
- ;}
+ pc->day = (yyvsp[-2].textintval).value;
+ pc->month = (yyvsp[-1].intval);
+ pc->year = (yyvsp[0].textintval);
+ }
+#line 1669 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 32:
-#line 355 "getdate.y"
+#line 354 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- PC.rel_seconds = -PC.rel_seconds;
- PC.rel_minutes = -PC.rel_minutes;
- PC.rel_hour = -PC.rel_hour;
- PC.rel_day = -PC.rel_day;
- PC.rel_month = -PC.rel_month;
- PC.rel_year = -PC.rel_year;
- ;}
+ pc->rel_seconds = -pc->rel_seconds;
+ pc->rel_minutes = -pc->rel_minutes;
+ pc->rel_hour = -pc->rel_hour;
+ pc->rel_day = -pc->rel_day;
+ pc->rel_month = -pc->rel_month;
+ pc->rel_year = -pc->rel_year;
+ }
+#line 1682 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 34:
-#line 368 "getdate.y"
- { PC.rel_year += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 367 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_year += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1688 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 35:
-#line 370 "getdate.y"
- { PC.rel_year += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 369 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_year += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1694 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 36:
-#line 372 "getdate.y"
- { PC.rel_year += (yyvsp[(1) - (1)].intval); ;}
+#line 371 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_year += (yyvsp[0].intval); }
+#line 1700 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 37:
-#line 374 "getdate.y"
- { PC.rel_month += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 373 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_month += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1706 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 38:
-#line 376 "getdate.y"
- { PC.rel_month += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 375 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_month += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1712 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 39:
-#line 378 "getdate.y"
- { PC.rel_month += (yyvsp[(1) - (1)].intval); ;}
+#line 377 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_month += (yyvsp[0].intval); }
+#line 1718 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 40:
-#line 380 "getdate.y"
- { PC.rel_day += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 379 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_day += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1724 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 41:
-#line 382 "getdate.y"
- { PC.rel_day += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 381 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_day += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1730 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 42:
-#line 384 "getdate.y"
- { PC.rel_day += (yyvsp[(1) - (1)].intval); ;}
+#line 383 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_day += (yyvsp[0].intval); }
+#line 1736 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 43:
-#line 386 "getdate.y"
- { PC.rel_hour += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 385 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_hour += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1742 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 44:
-#line 388 "getdate.y"
- { PC.rel_hour += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 387 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_hour += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1748 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 45:
-#line 390 "getdate.y"
- { PC.rel_hour += (yyvsp[(1) - (1)].intval); ;}
+#line 389 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_hour += (yyvsp[0].intval); }
+#line 1754 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 46:
-#line 392 "getdate.y"
- { PC.rel_minutes += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 391 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_minutes += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1760 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 47:
-#line 394 "getdate.y"
- { PC.rel_minutes += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 393 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_minutes += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1766 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 48:
-#line 396 "getdate.y"
- { PC.rel_minutes += (yyvsp[(1) - (1)].intval); ;}
+#line 395 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_minutes += (yyvsp[0].intval); }
+#line 1772 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 49:
-#line 398 "getdate.y"
- { PC.rel_seconds += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 397 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_seconds += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1778 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 50:
-#line 400 "getdate.y"
- { PC.rel_seconds += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;}
+#line 399 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_seconds += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 1784 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 51:
-#line 402 "getdate.y"
- { PC.rel_seconds += (yyvsp[(1) - (1)].intval); ;}
+#line 401 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { pc->rel_seconds += (yyvsp[0].intval); }
+#line 1790 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 52:
-#line 407 "getdate.y"
+#line 406 "source3/modules/getdate.y" /* yacc.c:1646 */
{
- if (PC.dates_seen
- && ! PC.rels_seen && (PC.times_seen || 2 < (yyvsp[(1) - (1)].textintval).digits))
- PC.year = (yyvsp[(1) - (1)].textintval);
+ if (pc->dates_seen
+ && ! pc->rels_seen && (pc->times_seen || 2 < (yyvsp[0].textintval).digits))
+ pc->year = (yyvsp[0].textintval);
else
{
- if (4 < (yyvsp[(1) - (1)].textintval).digits)
+ if (4 < (yyvsp[0].textintval).digits)
{
- PC.dates_seen++;
- PC.day = (yyvsp[(1) - (1)].textintval).value % 100;
- PC.month = ((yyvsp[(1) - (1)].textintval).value / 100) % 100;
- PC.year.value = (yyvsp[(1) - (1)].textintval).value / 10000;
- PC.year.digits = (yyvsp[(1) - (1)].textintval).digits - 4;
+ pc->dates_seen++;
+ pc->day = (yyvsp[0].textintval).value % 100;
+ pc->month = ((yyvsp[0].textintval).value / 100) % 100;
+ pc->year.value = (yyvsp[0].textintval).value / 10000;
+ pc->year.digits = (yyvsp[0].textintval).digits - 4;
}
else
{
- PC.times_seen++;
- if ((yyvsp[(1) - (1)].textintval).digits <= 2)
+ pc->times_seen++;
+ if ((yyvsp[0].textintval).digits <= 2)
{
- PC.hour = (yyvsp[(1) - (1)].textintval).value;
- PC.minutes = 0;
+ pc->hour = (yyvsp[0].textintval).value;
+ pc->minutes = 0;
}
else
{
- PC.hour = (yyvsp[(1) - (1)].textintval).value / 100;
- PC.minutes = (yyvsp[(1) - (1)].textintval).value % 100;
+ pc->hour = (yyvsp[0].textintval).value / 100;
+ pc->minutes = (yyvsp[0].textintval).value % 100;
}
- PC.seconds = 0;
- PC.meridian = MER24;
+ pc->seconds = 0;
+ pc->meridian = MER24;
}
}
- ;}
+ }
+#line 1827 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 53:
-#line 443 "getdate.y"
- { (yyval.intval) = MER24; ;}
+#line 442 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { (yyval.intval) = MER24; }
+#line 1833 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
case 54:
-#line 445 "getdate.y"
- { (yyval.intval) = (yyvsp[(1) - (1)].intval); ;}
+#line 444 "source3/modules/getdate.y" /* yacc.c:1646 */
+ { (yyval.intval) = (yyvsp[0].intval); }
+#line 1839 "source3/modules/getdate.c" /* yacc.c:1646 */
break;
-/* Line 1267 of yacc.c. */
-#line 1935 "getdate.c"
+#line 1843 "source3/modules/getdate.c" /* yacc.c:1646 */
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
@@ -1943,8 +1861,7 @@ yyreduce:
*++yyvsp = yyval;
-
- /* Now `shift' the result of the reduction. Determine what state
+ /* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -1959,48 +1876,51 @@ yyreduce:
goto yynewstate;
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error. |
+`--------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
++yynerrs;
#if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
+ yyerror (pc, YY_("syntax error"));
#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+ yyssp, yytoken)
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ char const *yymsgp = YY_("syntax error");
+ int yysyntax_error_status;
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ if (yysyntax_error_status == 0)
+ yymsgp = yymsg;
+ else if (yysyntax_error_status == 1)
+ {
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+ if (!yymsg)
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = 2;
+ }
+ else
+ {
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ yymsgp = yymsg;
+ }
+ }
+ yyerror (pc, yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
@@ -2008,24 +1928,24 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse look-ahead token after an
- error, discard it. */
+ /* If just tried and failed to reuse lookahead token after an
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval, pc);
+ yychar = YYEMPTY;
+ }
}
- /* Else will try to reuse look-ahead token after shifting the error
+ /* Else will try to reuse lookahead token after shifting the error
token. */
goto yyerrlab1;
@@ -2041,7 +1961,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
yylen = 0;
@@ -2054,38 +1974,37 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ if (!yypact_value_is_default (yyn))
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp, pc);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
/* Shift the error token. */
@@ -2109,28 +2028,33 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
+ yyerror (pc, YY_("memory exhausted"));
yyresult = 2;
/* Fall through. */
#endif
yyreturn:
- if (yychar != YYEOF && yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
- /* Do not reclaim the symbols of the rule which action triggered
+ if (yychar != YYEMPTY)
+ {
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval, pc);
+ }
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp);
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp, pc);
YYPOPSTACK (1);
}
#ifndef yyoverflow
@@ -2141,12 +2065,9 @@ yyreturn:
if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg);
#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
+ return yyresult;
}
-
-
-#line 448 "getdate.y"
+#line 447 "source3/modules/getdate.y" /* yacc.c:1906 */
/* Include this file down here because bison inserts code above which
@@ -2376,7 +2297,7 @@ to_year (textint textyear)
}
static table const *
-lookup_zone (parser_control const *pc, char const *name)
+lookup_zone (struct parser_control const *pc, char const *name)
{
table const *tp;
@@ -2420,7 +2341,7 @@ tm_diff (struct tm const *a, struct tm const *b)
#endif /* ! HAVE_TM_GMTOFF */
static table const *
-lookup_word (parser_control const *pc, char *word)
+lookup_word (struct parser_control const *pc, char *word)
{
char *p;
char *q;
@@ -2489,7 +2410,7 @@ lookup_word (parser_control const *pc, char *word)
}
static int
-yylex (YYSTYPE *lvalp, parser_control *pc)
+yylex (YYSTYPE *lvalp, struct parser_control *pc)
{
unsigned char c;
size_t count;
@@ -2531,18 +2452,18 @@ yylex (YYSTYPE *lvalp, parser_control *pc)
if (ISALPHA (c))
{
char buff[20];
- char *p = buff;
+ size_t i = 0;
table const *tp;
do
{
- if (p < buff + sizeof buff - 1)
- *p++ = c;
+ if (i < 20)
+ buff[i++] = c;
c = *++pc->input;
}
while (ISALPHA (c) || c == '.');
- *p = '\0';
+ buff[i] = '\0';
tp = lookup_word (pc, buff);
if (! tp)
return '?';
@@ -2569,7 +2490,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc)
/* Do nothing if the parser reports an error. */
static int
-yyerror (const char *s ATTRIBUTE_UNUSED)
+yyerror (struct parser_control *pc ATTRIBUTE_UNUSED, const char *s ATTRIBUTE_UNUSED)
{
return 0;
}
@@ -2585,7 +2506,7 @@ get_date (const char *p, const time_t *now)
struct tm *tmp = localtime (&Start);
struct tm tm;
struct tm tm0;
- parser_control pc;
+ struct parser_control pc;
if (! tmp)
return -1;
@@ -2819,4 +2740,3 @@ main (int ac, char **av)
return 0;
}
#endif /* defined TEST */
-
--
2.16.2
>From 3f532125a90334c2b99f986c3f4a4a7e3bbb1d71 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 10:14:50 +0100
Subject: [PATCH 17/22] wafsamba: Add missing cflags_end argument to
SAMBA_MODULE
Signed-off-by: Andreas Schneider <asn at samba.org>
---
buildtools/wafsamba/wafsamba.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1e331e5fcb3..1f567939505 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -458,6 +458,7 @@ def SAMBA_MODULE(bld, modname, source,
autoproto=None,
autoproto_extra_source='',
cflags='',
+ cflags_end=None,
internal_module=True,
local_include=True,
global_include=True,
@@ -488,6 +489,7 @@ def SAMBA_MODULE(bld, modname, source,
autoproto=autoproto,
autoproto_extra_source=autoproto_extra_source,
cflags=cflags,
+ cflags_end=cflags_end,
local_include=local_include,
global_include=global_include,
allow_warnings=allow_warnings,
@@ -527,6 +529,7 @@ def SAMBA_MODULE(bld, modname, source,
deps=deps,
includes=includes,
cflags=cflags,
+ cflags_end=cflags_end,
realname = realname,
autoproto = autoproto,
local_include=local_include,
--
2.16.2
>From f3fd3287d51ff379c9da5ea0f0f79a9778f6e1d4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 16:27:00 +0100
Subject: [PATCH 18/22] replace: Check for -Wno-strict-overflow
Signed-off-by: Andreas Schneider <asn at samba.org>
---
lib/replace/wscript | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 66398970da3..541573babf2 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -122,6 +122,9 @@ def configure(conf):
if conf.CHECK_CFLAGS('-Wno-unused-function'):
conf.define('HAVE_WNO_UNUSED_FUNCTION', '1')
+ if conf.CHECK_CFLAGS('-Wno-strict-overflow'):
+ conf.define('HAVE_WNO_STRICT_OVERFLOW', '1')
+
# Check for process set name support
conf.CHECK_CODE('''
#include <sys/prctl.h>
--
2.16.2
>From ece3de23664768cd5112bc90c075c39468c1f639 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 10:18:17 +0100
Subject: [PATCH 19/22] s3:modules: Set -Wno-strict-overflow for getdate if
supported
bison generates an C89 files which does some weired things.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/modules/wscript_build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 5c529890470..027283bff87 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -117,10 +117,15 @@ bld.SAMBA3_MODULE('vfs_default_quota',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
+module_cflags=''
+if bld.CONFIG_SET('HAVE_WNO_STRICT_OVERFLOW'):
+ module_cflags='-Wno-strict-overflow'
+
bld.SAMBA3_MODULE('vfs_readonly',
subsystem='vfs',
source='vfs_readonly.c getdate.c',
deps='samba-util',
+ cflags_end=module_cflags,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
--
2.16.2
>From 0c596dae6b286244aa70f8ce7ce8eb1a2f39a8a3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 10:52:54 +0100
Subject: [PATCH 20/22] wafsamba: Add missing cflags_end argument to
SAMBA_BINARY
Signed-off-by: Andreas Schneider <asn at samba.org>
---
buildtools/wafsamba/wafsamba.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1f567939505..12d5421c4a6 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -353,6 +353,7 @@ def SAMBA_BINARY(bld, binname, source,
modules=None,
ldflags=None,
cflags='',
+ cflags_end=None,
autoproto=None,
use_hostcc=False,
use_global_deps=True,
@@ -410,6 +411,7 @@ def SAMBA_BINARY(bld, binname, source,
deps = deps,
includes = includes,
cflags = pie_cflags,
+ cflags_end = cflags_end,
group = subsystem_group,
autoproto = autoproto,
subsystem_name = subsystem_name,
--
2.16.2
>From 9722bf5b34fcaee252b240f32182b897f14dfd34 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Fri, 23 Mar 2018 10:53:14 +0100
Subject: [PATCH 21/22] s3:nmbd: Set -Wno-strict-overflow for nmbd if supported
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/nmbd/wscript_build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/source3/nmbd/wscript_build b/source3/nmbd/wscript_build
index 843c900a4ba..c34deae6083 100644
--- a/source3/nmbd/wscript_build
+++ b/source3/nmbd/wscript_build
@@ -1,5 +1,9 @@
#!/usr/bin/env python
+nmbd_cflags=''
+if bld.CONFIG_SET('HAVE_WNO_STRICT_OVERFLOW'):
+ nmbd_cflags='-Wno-strict-overflow'
+
bld.SAMBA3_BINARY('nmbd',
source='''
asyncdns.c
@@ -30,6 +34,7 @@ bld.SAMBA3_BINARY('nmbd',
nmbd_workgroupdb.c
nmbd_synclists.c
''',
+ cflags_end=nmbd_cflags,
deps='''
talloc
tevent
--
2.16.2
>From d5c2a603bba2799173b5e2a4cd58eadbea65d536 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Thu, 7 Dec 2017 15:27:44 +0100
Subject: [PATCH 22/22] wafsamba: Add '-Werror=strict-overflow
-Wstrict-overflow=2' to the developer build
We could move it to 3, but shouldn't go higher. If you set it to 4 and 5
youl will probably also get a lot of false positives.
Signed-off-by: Andreas Schneider <asn at samba.org>
---
buildtools/wafsamba/samba_autoconf.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 35f4f36f61c..bdd7c8bd195 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -713,6 +713,8 @@ def SAMBA_CONFIG_H(conf, path=None):
testflags=True)
conf.ADD_CFLAGS('-Wimplicit-fallthrough',
testflags=True)
+ conf.ADD_CFLAGS('-Werror=strict-overflow -Wstrict-overflow=2',
+ testflags=True)
conf.ADD_CFLAGS('-Wformat=2 -Wno-format-y2k', testflags=True)
conf.ADD_CFLAGS('-Wno-format-zero-length', testflags=True)
--
2.16.2
More information about the samba-technical
mailing list