diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-03-15 15:16:29 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-03-15 15:16:29 +0200 |
commit | a6d33abe1d17ea1d004c645cc27120c92d7aa8e6 (patch) | |
tree | a752e9c99368d017c7da7ab8e731cfb706979068 /lib | |
parent | 58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2 (diff) | |
download | eclat-a6d33abe1d17ea1d004c645cc27120c92d7aa8e6.tar.gz eclat-a6d33abe1d17ea1d004c645cc27120c92d7aa8e6.tar.bz2 |
Minor fixes
Diffstat (limited to 'lib')
-rw-r--r-- | lib/confirm.c | 3 | ||||
-rw-r--r-- | lib/forlan.c | 6 | ||||
-rw-r--r-- | lib/forlangrm.y | 4 | ||||
-rw-r--r-- | lib/forlanlex.l | 1 | ||||
-rw-r--r-- | lib/ldapmap.c | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/lib/confirm.c b/lib/confirm.c index ff60440..550a822 100644 --- a/lib/confirm.c +++ b/lib/confirm.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* This file is part of Eclat. | 1 | /* This file is part of Eclat. |
2 | Copyright (C) 2012-2015 Sergey Poznyakoff. | 2 | Copyright (C) 2012-2018 Sergey Poznyakoff. |
3 | 3 | ||
4 | Eclat is free software; you can redistribute it and/or modify | 4 | Eclat is free software; you can redistribute it and/or modify |
5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
6 | the Free Software Foundation; either version 3, or (at your option) | 6 | the Free Software Foundation; either version 3, or (at your option) |
7 | any later version. | 7 | any later version. |
8 | 8 | ||
@@ -12,12 +12,13 @@ | |||
12 | GNU General Public License for more details. | 12 | GNU General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
15 | along with Eclat. If not, see <http://www.gnu.org/licenses/>. */ | 15 | along with Eclat. If not, see <http://www.gnu.org/licenses/>. */ |
16 | 16 | ||
17 | #include "libeclat.h" | 17 | #include "libeclat.h" |
18 | #include <unistd.h> | ||
18 | #include <sysexits.h> | 19 | #include <sysexits.h> |
19 | 20 | ||
20 | int | 21 | int |
21 | eclat_confirm(enum eclat_confirm_mode mode, const char *prompt, ...) | 22 | eclat_confirm(enum eclat_confirm_mode mode, const char *prompt, ...) |
22 | { | 23 | { |
23 | int rc; | 24 | int rc; |
diff --git a/lib/forlan.c b/lib/forlan.c index 977271d..9fc80cb 100644 --- a/lib/forlan.c +++ b/lib/forlan.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* This file is part of Eclat. | 1 | /* This file is part of Eclat. |
2 | Copyright (C) 2012-2015 Sergey Poznyakoff. | 2 | Copyright (C) 2012-2018 Sergey Poznyakoff. |
3 | 3 | ||
4 | Eclat is free software; you can redistribute it and/or modify | 4 | Eclat is free software; you can redistribute it and/or modify |
5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
6 | the Free Software Foundation; either version 3, or (at your option) | 6 | the Free Software Foundation; either version 3, or (at your option) |
7 | any later version. | 7 | any later version. |
8 | 8 | ||
@@ -976,16 +976,16 @@ func_sort(forlan_eval_env_t env, struct grecs_list *list) | |||
976 | return; | 976 | return; |
977 | 977 | ||
978 | forlan_sort_key = NULL; | 978 | forlan_sort_key = NULL; |
979 | forlan_compar = forlan_compar_string; | 979 | forlan_compar = forlan_compar_string; |
980 | forlan_sort_reverse = 0; | 980 | forlan_sort_reverse = 0; |
981 | 981 | ||
982 | if (ep = list->head->next) { | 982 | if ((ep = list->head->next)) { |
983 | t = ep->data; | 983 | t = ep->data; |
984 | forlan_sort_key = t->v.string; | 984 | forlan_sort_key = t->v.string; |
985 | if (ep = ep->next) { | 985 | if ((ep = ep->next)) { |
986 | char *p; | 986 | char *p; |
987 | 987 | ||
988 | t = ep->data; | 988 | t = ep->data; |
989 | for (p = t->v.string; *p; p++) { | 989 | for (p = t->v.string; *p; p++) { |
990 | switch (*p) { | 990 | switch (*p) { |
991 | case 'n': | 991 | case 'n': |
diff --git a/lib/forlangrm.y b/lib/forlangrm.y index 2db1274..9d44ec9 100644 --- a/lib/forlangrm.y +++ b/lib/forlangrm.y | |||
@@ -20,13 +20,13 @@ | |||
20 | #include <grecs/locus.h> | 20 | #include <grecs/locus.h> |
21 | #include "forlangrm.h" | 21 | #include "forlangrm.h" |
22 | #include "forlan.h" | 22 | #include "forlan.h" |
23 | #include <string.h> | 23 | #include <string.h> |
24 | 24 | ||
25 | int yylex(); | 25 | int yylex(); |
26 | static int yyerror(char *); | 26 | static int yyerror(char const *); |
27 | union forlan_node *forlan_parse_tree; | 27 | union forlan_node *forlan_parse_tree; |
28 | size_t forlan_variable_count; | 28 | size_t forlan_variable_count; |
29 | static struct grecs_symtab *forlan_symtab; | 29 | static struct grecs_symtab *forlan_symtab; |
30 | 30 | ||
31 | static size_t find_variable(const char *name); | 31 | static size_t find_variable(const char *name); |
32 | static union forlan_node *create_comp_node(union forlan_node *root, | 32 | static union forlan_node *create_comp_node(union forlan_node *root, |
@@ -368,13 +368,13 @@ stmt_asgn : IDENT '=' node ';' | |||
368 | $$->asgn.idx = find_variable($1); | 368 | $$->asgn.idx = find_variable($1); |
369 | $$->asgn.node = $3; | 369 | $$->asgn.node = $3; |
370 | } | 370 | } |
371 | ; | 371 | ; |
372 | %% | 372 | %% |
373 | static int | 373 | static int |
374 | yyerror(char *s) | 374 | yyerror(char const *s) |
375 | { | 375 | { |
376 | grecs_error(&yylloc, 0, "%s", s); | 376 | grecs_error(&yylloc, 0, "%s", s); |
377 | return 0; | 377 | return 0; |
378 | } | 378 | } |
379 | 379 | ||
380 | int | 380 | int |
diff --git a/lib/forlanlex.l b/lib/forlanlex.l index 62265cb..0fc469e 100644 --- a/lib/forlanlex.l +++ b/lib/forlanlex.l | |||
@@ -53,12 +53,13 @@ static size_t forlan_input_pos; | |||
53 | } while (0); | 53 | } while (0); |
54 | 54 | ||
55 | static int yywrap(void); | 55 | static int yywrap(void); |
56 | 56 | ||
57 | %} | 57 | %} |
58 | 58 | ||
59 | %option noinput | ||
59 | %option nounput | 60 | %option nounput |
60 | 61 | ||
61 | WS [ \t\f][ \t\f]* | 62 | WS [ \t\f][ \t\f]* |
62 | ID [a-zA-Z_][a-zA-Z_0-9-]* | 63 | ID [a-zA-Z_][a-zA-Z_0-9-]* |
63 | %x COMMENT ML STR | 64 | %x COMMENT ML STR |
64 | %% | 65 | %% |
diff --git a/lib/ldapmap.c b/lib/ldapmap.c index 61cdf87..09b0689 100644 --- a/lib/ldapmap.c +++ b/lib/ldapmap.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* This file is part of Eclat. | 1 | /* This file is part of Eclat. |
2 | Copyright (C) 2012-2015 Sergey Poznyakoff. | 2 | Copyright (C) 2012-2018 Sergey Poznyakoff. |
3 | 3 | ||
4 | Eclat is free software; you can redistribute it and/or modify | 4 | Eclat is free software; you can redistribute it and/or modify |
5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
6 | the Free Software Foundation; either version 3, or (at your option) | 6 | the Free Software Foundation; either version 3, or (at your option) |
7 | any later version. | 7 | any later version. |
8 | 8 | ||
@@ -18,12 +18,13 @@ | |||
18 | #include "wordsplit.h" | 18 | #include "wordsplit.h" |
19 | #include <ldap.h> | 19 | #include <ldap.h> |
20 | #include <errno.h> | 20 | #include <errno.h> |
21 | #include <sysexits.h> | 21 | #include <sysexits.h> |
22 | #include <signal.h> | 22 | #include <signal.h> |
23 | #include <pwd.h> | 23 | #include <pwd.h> |
24 | #include <unistd.h> | ||
24 | 25 | ||
25 | enum { tls_no, tls_yes, tls_only }; | 26 | enum { tls_no, tls_yes, tls_only }; |
26 | 27 | ||
27 | struct ldap_map { | 28 | struct ldap_map { |
28 | unsigned long ldap_version; | 29 | unsigned long ldap_version; |
29 | char *uri; | 30 | char *uri; |