mirror of
https://github.com/openstreetmap/mod_tile.git
synced 2025-08-12 02:41:14 +00:00
296f888752
* Resolved warnings in `src/daemon.c`
I.E.:
```
src/daemon.c:835:16: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
char *name = iniparser_getsecname(ini, section);
^~~~~~~~~~~~~~~~~~~~
src/daemon.c:860:20: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
char *ini_uri = iniparser_getstring(ini, buffer, (char *)"");
^~~~~~~~~~~~~~~~~~~
```
* Resolved warning in `src/mod_tile.c`
I.E.:
```
./src/mod_tile.c:327:53: warning: format '%d' expects argument of type 'int', but argument 9 has type 'long unsigned int' [-Wformat=]
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "request_tile: Failed to read response from rendering socket. Got %d bytes but expected %d. Errno %d (%s)",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ret, sizeof(struct protocol_v2), errno, strerror(errno));
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
long unsigned int
```
* Resolved `cppcheck`-detected error
I.E.:
```
src/store_rados.c:355:3: error: Memory leak: store [memleak]
return NULL;
^
```
* Fix `Does not check for buffer overflows (CWE-120)` in `src/daemon.c`
* Fix `Does not check for buffer overflows (CWE-120)` in `src/cache_expire.c`
* Resolved `cppcheck`-detected error
I.E.:
```
src/parameterize_style.cpp:43:3: error: Memory leak: data [memleak]
return; //No parameterization given
^
* url is `char *`, unlike buffer, size is not known
76 lines
1.8 KiB
C
76 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 2007 - 2020 by mod_tile contributors (see AUTHORS file)
|
|
*
|
|
* 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
|
|
* 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/.
|
|
*/
|
|
|
|
#ifndef DAEMON_H
|
|
#define DAEMON_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef HAVE_DAEMON
|
|
int daemon(int nochdir, int noclose);
|
|
#endif
|
|
|
|
#include <limits.h> /* for PATH_MAX */
|
|
#include "gen_tile.h"
|
|
#include "protocol.h"
|
|
|
|
#define INILINE_MAX 256
|
|
#define MAX_SLAVES 5
|
|
|
|
typedef struct {
|
|
const char *iphostname;
|
|
const char *mapnik_font_dir;
|
|
const char *mapnik_plugins_dir;
|
|
const char *pid_filename;
|
|
const char *socketname;
|
|
const char *stats_filename;
|
|
const char *tile_dir;
|
|
int ipport;
|
|
int mapnik_font_dir_recurse;
|
|
int num_threads;
|
|
} renderd_config;
|
|
|
|
typedef struct {
|
|
char xmlname[XMLCONFIG_MAX];
|
|
char xmlfile[PATH_MAX];
|
|
char xmluri[PATH_MAX];
|
|
char host[PATH_MAX];
|
|
char htcpip[PATH_MAX];
|
|
char tile_dir[PATH_MAX];
|
|
char parameterization[PATH_MAX];
|
|
int tile_px_size;
|
|
double scale_factor;
|
|
int min_zoom;
|
|
int max_zoom;
|
|
int num_threads;
|
|
} xmlconfigitem;
|
|
|
|
|
|
|
|
extern struct request_queue * render_request_queue;
|
|
|
|
void statsRenderFinish(int z, long time);
|
|
void request_exit(void);
|
|
void send_response(struct item *item, enum protoCmd rsp, int render_time);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif
|