RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-13 23:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: stdbool is not portable

Browse Source 
Benjamin Polidore reported a build issue on Solaris with gcc 4.2.4 where
stdbool is not usable without c99. It only appeared at one location in
dumpstats and is totally useless, let's use the more common and portable
int as everywhere else.
This commit is contained in:
Willy Tarreau 2012-12-05 23:01:12 +01:00
parent af9619da3e
commit 4445502351
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dumpstats.c
View File

@ -14,7 +14,6 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -66,7 +65,7 @@ static int stats_dump_raw_to_buffer(struct stream_interface *si);
static int stats_dump_full_sess_to_buffer(struct stream_interface *si, struct session *sess);
static int stats_dump_sess_to_buffer(struct stream_interface *si);
static int stats_dump_errors_to_buffer(struct stream_interface *si);
static int stats_table_request(struct stream_interface *si, bool show);
static int stats_table_request(struct stream_interface *si, int show);
static int stats_dump_proxy(struct stream_interface *si, struct proxy *px, struct uri_auth *uri);
static int stats_dump_http(struct stream_interface *si, struct uri_auth *uri);
@ -3957,12 +3956,12 @@ void cli_release_handler(struct stream_interface *si)
* properly set. It returns 0 if the output buffer is full and it needs
* to be called again, otherwise non-zero.
*/
static int stats_table_request(struct stream_interface *si, bool show)
static int stats_table_request(struct stream_interface *si, int show)
{
struct session *s = si->conn->xprt_ctx;
struct ebmb_node *eb;
int dt;
bool skip_entry;
int skip_entry;
/*
* We have 3 possible states in si->conn->xprt_st :
@ -4027,7 +4026,7 @@ static int stats_table_request(struct stream_interface *si, bool show)
break;
case STAT_ST_LIST:
skip_entry = false;
skip_entry = 0;
if (si->applet.ctx.table.data_type >= 0) {
/* we're filtering on some data contents */
@ -4069,7 +4068,7 @@ static int stats_table_request(struct stream_interface *si, bool show)
(si->applet.ctx.table.data_op == STD_OP_EQ ||
si->applet.ctx.table.data_op == STD_OP_LT ||
si->applet.ctx.table.data_op == STD_OP_LE)))
skip_entry = true;
skip_entry = 1;
}
if (show && !skip_entry &&