1. clamav-devel
  2. Commit 3f25b35db98fb5ca622d33a5a12da0037d57cd13
Browse code

Fix duplicate const qualifier (bb #1798).

Török Edvin authored on 2010/01/27 18:04:34
Showing 3 changed files
libclamav/bytecode_api.c
History View file @ 3f25b35
... ... 
@@ -180,7 +180,7 @@ void cli_bytecode_context_set_trace(struct cli_bc_ctx* ctx, unsigned level,
180 180 
     ctx->trace_level = level;
181 181 
 }
182 182
183 
-uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const const uint8_t *scope, uint32_t scopeid)
183 
+uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const uint8_t *scope, uint32_t scopeid)
184 184 
 {
185 185 
     if (LIKELY(!ctx->trace_level))
186 186 
 	return 0;
... ... 
@@ -195,7 +195,7 @@ uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const const uint8_t *scop
195 195 
     return 0;
196 196 
 }
197 197
198 
-uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const const uint8_t* dir, uint32_t dummy)
198 
+uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const uint8_t* dir, uint32_t dummy)
199 199 
 {
200 200 
     if (LIKELY(!ctx->trace_level))
201 201 
 	return 0;
... ... 
@@ -203,7 +203,7 @@ uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const const uint8_t*
203 203 
     return 0;
204 204 
 }
205 205
206 
-uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const const uint8_t *file, uint32_t line)
206 
+uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const uint8_t *file, uint32_t line)
207 207 
 {
208 208 
     if (LIKELY(ctx->trace_level < trace_line))
209 209 
 	return 0;
... ... 
@@ -215,7 +215,7 @@ uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const const uint8_t *fil
215 215 
     return 0;
216 216 
 }
217 217
218 
-uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const const uint8_t *op, uint32_t col)
218 
+uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const uint8_t *op, uint32_t col)
219 219 
 {
220 220 
     if (LIKELY(ctx->trace_level < trace_col))
221 221 
 	return 0;
... ... 
@@ -240,7 +240,7 @@ uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const const uint8_t *op, uin
240 240 
     return 0;
241 241 
 }
242 242
243 
-uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const const uint8_t* name, uint32_t value)
243 
+uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const uint8_t* name, uint32_t value)
244 244 
 {
245 245 
     if (LIKELY(ctx->trace_level < trace_val))
246 246 
 	return 0;
... ... 
@@ -254,7 +254,7 @@ uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const const uint8_t* name
254 254 
     return 0;
255 255 
 }
256 256
257 
-uint32_t cli_bcapi_trace_ptr(struct cli_bc_ctx *ctx, const const uint8_t* ptr, uint32_t dummy)
257 
+uint32_t cli_bcapi_trace_ptr(struct cli_bc_ctx *ctx, const uint8_t* ptr, uint32_t dummy)
258 258 
 {
259 259 
     if (LIKELY(ctx->trace_level < trace_val))
260 260 
 	return 0;
libclamav/bytecode_api_decl.c
History View file @ 3f25b35
... ... 
@@ -38,18 +38,18 @@ uint32_t cli_bcapi_test1(struct cli_bc_ctx *ctx, uint32_t, uint32_t);
38 38 
 int32_t cli_bcapi_read(struct cli_bc_ctx *ctx, uint8_t*, int32_t);
39 39 
 int32_t cli_bcapi_write(struct cli_bc_ctx *ctx, uint8_t*, int32_t);
40 40 
 int32_t cli_bcapi_seek(struct cli_bc_ctx *ctx, int32_t, uint32_t);
41 
-uint32_t cli_bcapi_setvirusname(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
42 
-uint32_t cli_bcapi_debug_print_str(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
41 
+uint32_t cli_bcapi_setvirusname(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
42 
+uint32_t cli_bcapi_debug_print_str(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
43 43 
 uint32_t cli_bcapi_debug_print_uint(struct cli_bc_ctx *ctx, uint32_t);
44 44 
 uint32_t cli_bcapi_disasm_x86(struct cli_bc_ctx *ctx, struct DISASM_RESULT*, uint32_t);
45 
-uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
46 
-uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
47 
-uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
48 
-uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
49 
-uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
50 
-uint32_t cli_bcapi_trace_ptr(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
45 
+uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
46 
+uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
47 
+uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
48 
+uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
49 
+uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
50 
+uint32_t cli_bcapi_trace_ptr(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
51 51 
 uint32_t cli_bcapi_pe_rawaddr(struct cli_bc_ctx *ctx, uint32_t);
52 
-int32_t cli_bcapi_file_find(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
52 
+int32_t cli_bcapi_file_find(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
53 53 
 int32_t cli_bcapi_file_byteat(struct cli_bc_ctx *ctx, uint32_t);
54 54 
 uint8_t* cli_bcapi_malloc(struct cli_bc_ctx *ctx, uint32_t);
55 55 
 uint32_t cli_bcapi_test2(struct cli_bc_ctx *ctx, uint32_t);
libclamav/bytecode_api_impl.h
History View file @ 3f25b35
... ... 
@@ -35,18 +35,18 @@ uint32_t cli_bcapi_test1(struct cli_bc_ctx *ctx, uint32_t, uint32_t);
35 35 
 int32_t cli_bcapi_read(struct cli_bc_ctx *ctx, uint8_t*, int32_t);
36 36 
 int32_t cli_bcapi_write(struct cli_bc_ctx *ctx, uint8_t*, int32_t);
37 37 
 int32_t cli_bcapi_seek(struct cli_bc_ctx *ctx, int32_t, uint32_t);
38 
-uint32_t cli_bcapi_setvirusname(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
39 
-uint32_t cli_bcapi_debug_print_str(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
38 
+uint32_t cli_bcapi_setvirusname(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
39 
+uint32_t cli_bcapi_debug_print_str(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
40 40 
 uint32_t cli_bcapi_debug_print_uint(struct cli_bc_ctx *ctx, uint32_t);
41 41 
 uint32_t cli_bcapi_disasm_x86(struct cli_bc_ctx *ctx, struct DISASM_RESULT*, uint32_t);
42 
-uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
43 
-uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
44 
-uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
45 
-uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
46 
-uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
47 
-uint32_t cli_bcapi_trace_ptr(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
42 
+uint32_t cli_bcapi_trace_directory(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
43 
+uint32_t cli_bcapi_trace_scope(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
44 
+uint32_t cli_bcapi_trace_source(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
45 
+uint32_t cli_bcapi_trace_op(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
46 
+uint32_t cli_bcapi_trace_value(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
47 
+uint32_t cli_bcapi_trace_ptr(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
48 48 
 uint32_t cli_bcapi_pe_rawaddr(struct cli_bc_ctx *ctx, uint32_t);
49 
-int32_t cli_bcapi_file_find(struct cli_bc_ctx *ctx, const const uint8_t*, uint32_t);
49 
+int32_t cli_bcapi_file_find(struct cli_bc_ctx *ctx, const uint8_t*, uint32_t);
50 50 
 int32_t cli_bcapi_file_byteat(struct cli_bc_ctx *ctx, uint32_t);
51 51 
 uint8_t* cli_bcapi_malloc(struct cli_bc_ctx *ctx, uint32_t);
52 52 
 uint32_t cli_bcapi_test2(struct cli_bc_ctx *ctx, uint32_t);