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

BUILD: don't use type "uint" which is not portable

Browse Source 
Dmitry Sivachenko reported that "uint" doesn't build on FreeBSD 10.
On Linux it's defined in sys/types.h and indicated as "old". Just
get rid of the very few occurrences.
This commit is contained in:
Willy Tarreau 2014-05-28 23:05:07 +02:00
parent 2e85840266
commit c874653bb4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/halog/halog.c
View File

@ -694,7 +694,7 @@ int main(int argc, char **argv)
struct eb32_node *n; struct eb32_node *n;
struct url_stat *ustat = NULL; struct url_stat *ustat = NULL;
int val, test; int val, test;
uint uval; unsigned int uval;
int filter_acc_delay = 0, filter_acc_count = 0; int filter_acc_delay = 0, filter_acc_count = 0;
int filter_time_resp = 0; int filter_time_resp = 0;
int filt_http_status_low = 0, filt_http_status_high = 0; int filt_http_status_low = 0, filt_http_status_high = 0;

2
include/common/regex.h
View File

@ -79,7 +79,7 @@ extern regmatch_t pmatch[MAX_MATCH];
* The function return 1 is succes case, else return 0 and err is filled. * The function return 1 is succes case, else return 0 and err is filled.
*/ */
int regex_comp(const char *str, struct my_regex *regex, int cs, int cap, char **err); int regex_comp(const char *str, struct my_regex *regex, int cs, int cap, char **err);
int exp_replace(char *dst, uint dst_size, char *src, const char *str, const regmatch_t *matches); int exp_replace(char *dst, unsigned int dst_size, char *src, const char *str, const regmatch_t *matches);
const char *check_replace_string(const char *str); const char *check_replace_string(const char *str);
const char *chain_regex(struct hdr_exp **head, const regex_t *preg, const char *chain_regex(struct hdr_exp **head, const regex_t *preg,
int action, const char *replace, void *cond); int action, const char *replace, void *cond);

2
src/regex.c
View File

@ -22,7 +22,7 @@
/* regex trash buffer used by various regex tests */ /* regex trash buffer used by various regex tests */
regmatch_t pmatch[MAX_MATCH]; /* rm_so, rm_eo for regular expressions */ regmatch_t pmatch[MAX_MATCH]; /* rm_so, rm_eo for regular expressions */
int exp_replace(char *dst, uint dst_size, char *src, const char *str, const regmatch_t *matches) int exp_replace(char *dst, unsigned int dst_size, char *src, const char *str, const regmatch_t *matches)
{ {
char *old_dst = dst; char *old_dst = dst;
char* dst_end = dst + dst_size; char* dst_end = dst + dst_size;

4
src/standard.c
View File

@ -2416,8 +2416,8 @@ char *env_expand(char *in)
const char *strnistr(const char *str1, int len_str1, const char *str2, int len_str2) const char *strnistr(const char *str1, int len_str1, const char *str2, int len_str2)
{ {
char *pptr, *sptr, *start; char *pptr, *sptr, *start;
uint slen, plen; unsigned int slen, plen;
uint tmp1, tmp2; unsigned int tmp1, tmp2;
if (str1 == NULL || len_str1 == 0) // search pattern into an empty string => search is not found if (str1 == NULL || len_str1 == 0) // search pattern into an empty string => search is not found
return NULL; return NULL;