1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
From: Robert Luberda <robert@debian.org>
Date: Sun, 21 Aug 2016 13:16:39 +0200
Subject: Fix some of compiler warnings
---
clientparse.y | 3 +++
daemon.c | 18 +++++++++---------
dictd.c | 2 ++
dictzip.c | 2 --
md5.c | 2 +-
parse.c | 4 ++--
servparse.y | 3 +++
7 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/clientparse.y b/clientparse.y
index f4162e6..d1960e3 100644
--- a/clientparse.y
+++ b/clientparse.y
@@ -22,6 +22,9 @@
#include "dict.h"
#define YYDEBUG 1
#define YYERROR_VERBOSE
+extern int yylex( void );
+extern int yydebug;
+extern void yyerror( const char *message );
static dictServer *s;
%}
diff --git a/daemon.c b/daemon.c
index d63e753..445c8c6 100644
--- a/daemon.c
+++ b/daemon.c
@@ -131,23 +131,23 @@ static void daemon_log( int type, const char *format, ... )
switch (type) {
case DICT_LOG_TERM:
- if (!flg_test(LOG_STATS)) return; marker = 'I'; break;
+ if (!flg_test(LOG_STATS)) { return; } marker = 'I'; break;
case DICT_LOG_TRACE:
- if (!flg_test(LOG_SERVER)) return; marker = 'I'; break;
+ if (!flg_test(LOG_SERVER)) { return; } marker = 'I'; break;
case DICT_LOG_CLIENT:
- if (!flg_test(LOG_CLIENT)) return; marker = 'C'; break;
+ if (!flg_test(LOG_CLIENT)) { return; } marker = 'C'; break;
case DICT_LOG_CONNECT:
- if (!flg_test(LOG_CONNECT)) return; marker = 'K'; break;
+ if (!flg_test(LOG_CONNECT)) { return; } marker = 'K'; break;
case DICT_LOG_DEFINE:
- if (!flg_test(LOG_FOUND)) return; marker = 'D'; break;
+ if (!flg_test(LOG_FOUND)) { return; } marker = 'D'; break;
case DICT_LOG_MATCH:
- if (!flg_test(LOG_FOUND)) return; marker = 'M'; break;
+ if (!flg_test(LOG_FOUND)) { return; } marker = 'M'; break;
case DICT_LOG_NOMATCH:
- if (!flg_test(LOG_NOTFOUND)) return; marker = 'N'; break;
+ if (!flg_test(LOG_NOTFOUND)) { return; } marker = 'N'; break;
case DICT_LOG_COMMAND:
- if (!flg_test(LOG_COMMAND)) return; marker = 'T'; break;
+ if (!flg_test(LOG_COMMAND)) { return; } marker = 'T'; break;
case DICT_LOG_AUTH:
- if (!flg_test(LOG_AUTH)) return; marker = 'A'; break;
+ if (!flg_test(LOG_AUTH)) { return; } marker = 'A'; break;
}
if (dbg_test(DBG_PORT))
diff --git a/dictd.c b/dictd.c
index fe27e42..3073ace 100644
--- a/dictd.c
+++ b/dictd.c
@@ -318,6 +318,7 @@ static void reload_config (void)
dict_init_databases (DictConfig);
}
+/*
static void xsigaddset (sigset_t *set, int signo)
{
if (sigaddset (set, signo)){
@@ -353,6 +354,7 @@ static void unblock_signals (void)
xsigprocmask (SIG_UNBLOCK, &set, NULL);
}
+*/
static void handler( int sig )
{
diff --git a/dictzip.c b/dictzip.c
index f917407..970eff8 100644
--- a/dictzip.c
+++ b/dictzip.c
@@ -336,10 +336,8 @@ int dict_data_zip( const char *inFilename, const char *outFilename,
static const char *id_string (void)
{
static char buffer[BUFFERSIZE];
- char *pt;
snprintf( buffer, BUFFERSIZE, "%s", DICT_VERSION );
- pt = buffer + strlen( buffer );
return buffer;
}
diff --git a/md5.c b/md5.c
index 8d1accf..7f2a7ff 100644
--- a/md5.c
+++ b/md5.c
@@ -145,7 +145,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
MD5Transform(ctx->buf, (uint32 *) ctx->in);
byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5
diff --git a/parse.c b/parse.c
index 1cdaf91..b6d1099 100644
--- a/parse.c
+++ b/parse.c
@@ -95,7 +95,7 @@ void prs_file( const char *filename )
"/usr/ccs/lib/cpp", /* Solaris */
"/usr/lang/cpp",
0 };
- static const char *extra_options = "";
+ /*static const char *extra_options = "";*/
FILE *tmp;
if (!filename)
@@ -116,7 +116,7 @@ void prs_file( const char *filename )
if ((t = strchr( buf, '\n' ))) *t = '\0';
PRINTF(MAA_PARSE,("%s: Using GNU cpp from %s\n", __func__, buf));
cpp = str_find( buf );
- extra_options = "-nostdinc -nostdinc++";
+ /*extra_options = "-nostdinc -nostdinc++";*/
}
pclose( tmp );
}
diff --git a/servparse.y b/servparse.y
index 4d4e0bc..12dd532 100644
--- a/servparse.y
+++ b/servparse.y
@@ -27,6 +27,9 @@
#define YYDEBUG 1
#define YYERROR_VERBOSE
+extern int yylex( void );
+extern int yydebug;
+extern void yyerror( const char *message );
static dictDatabase *db;
|
