Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
3d60db6b
Commit
3d60db6b
authored
Apr 27, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sort out some signed/unsigned mismatches
parent
a7baa5ce
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
13 deletions
+13
-13
vsl.h
include/vapi/vsl.h
+2
-2
vre.h
include/vre.h
+1
-1
vre.c
lib/libvarnish/vre.c
+1
-1
vsl.c
lib/libvarnishapi/vsl.c
+1
-1
vsl_cursor.c
lib/libvarnishapi/vsl_cursor.c
+2
-2
vut.c
lib/libvarnishapi/vut.c
+4
-4
vxp.h
lib/libvarnishapi/vxp.h
+1
-1
vxp_parse.c
lib/libvarnishapi/vxp_parse.c
+1
-1
No files found.
include/vapi/vsl.h
View file @
3d60db6b
...
...
@@ -110,8 +110,8 @@ enum VSL_reason_e {
struct
VSL_transaction
{
unsigned
level
;
int32_t
vxid
;
int32_t
vxid_parent
;
uint32_t
vxid
;
uint32_t
vxid_parent
;
enum
VSL_transaction_e
type
;
enum
VSL_reason_e
reason
;
struct
VSL_cursor
*
c
;
...
...
include/vre.h
View file @
3d60db6b
...
...
@@ -52,7 +52,7 @@ extern const unsigned VRE_has_jit;
extern
const
unsigned
VRE_CASELESS
;
extern
const
unsigned
VRE_NOTEMPTY
;
vre_t
*
VRE_compile
(
const
char
*
,
int
,
const
char
**
,
int
*
);
vre_t
*
VRE_compile
(
const
char
*
,
unsigned
,
const
char
**
,
int
*
);
int
VRE_exec
(
const
vre_t
*
code
,
const
char
*
subject
,
int
length
,
int
startoffset
,
int
options
,
int
*
ovector
,
int
ovecsize
,
const
volatile
struct
vre_limits
*
lim
);
...
...
lib/libvarnish/vre.c
View file @
3d60db6b
...
...
@@ -65,7 +65,7 @@ const unsigned VRE_CASELESS = PCRE_CASELESS;
const
unsigned
VRE_NOTEMPTY
=
PCRE_NOTEMPTY
;
vre_t
*
VRE_compile
(
const
char
*
pattern
,
int
options
,
VRE_compile
(
const
char
*
pattern
,
unsigned
options
,
const
char
**
errptr
,
int
*
erroffset
)
{
vre_t
*
v
;
...
...
lib/libvarnishapi/vsl.c
View file @
3d60db6b
...
...
@@ -368,7 +368,7 @@ VSL_PrintTransactions(struct VSL_data *vsl, struct VSL_transaction * const pt[],
else
VSL_PRINT
(
fo
,
"%-3.*s "
,
(
int
)(
t
->
level
),
"***"
);
VSL_PRINT
(
fo
,
"%*.s%-14s %*.s%-10
d
\n
"
,
VSL_PRINT
(
fo
,
"%*.s%-14s %*.s%-10
u
\n
"
,
verbose
?
10
+
1
:
0
,
" "
,
VSL_transactions
[
t
->
type
],
verbose
?
1
+
1
:
0
,
" "
,
...
...
lib/libvarnishapi/vsl_cursor.c
View file @
3d60db6b
...
...
@@ -318,7 +318,7 @@ vslc_file_delete(const struct VSL_cursor *cursor)
static
ssize_t
vslc_file_readn
(
int
fd
,
void
*
buf
,
size_t
n
)
{
size_t
t
=
0
;
s
s
ize_t
t
=
0
;
ssize_t
l
;
while
(
t
<
n
)
{
...
...
@@ -335,7 +335,7 @@ vslc_file_next(const struct VSL_cursor *cursor)
{
struct
vslc_file
*
c
;
ssize_t
i
;
size_t
l
;
s
s
ize_t
l
;
CAST_OBJ_NOTNULL
(
c
,
cursor
->
priv_data
,
VSLC_FILE_MAGIC
);
assert
(
&
c
->
cursor
==
cursor
);
...
...
lib/libvarnishapi/vut.c
View file @
3d60db6b
...
...
@@ -237,10 +237,10 @@ VUT_Setup(void)
AZ
(
VUT
.
vsm
);
AZ
(
VUT
.
vslq
);
/* Check input arguments */
if
((
VUT
.
n_arg
==
NULL
?
0
:
1
)
+
(
VUT
.
N_arg
==
NULL
?
0
:
1
)
+
(
VUT
.
r_arg
==
NULL
?
0
:
1
)
>
1
)
/* Check input arguments
(2 used for bug in FlexeLint)
*/
if
((
VUT
.
n_arg
==
NULL
?
0
:
2
)
+
(
VUT
.
N_arg
==
NULL
?
0
:
2
)
+
(
VUT
.
r_arg
==
NULL
?
0
:
2
)
>
2
)
VUT_Error
(
1
,
"Only one of -n, -N and -r options may be used"
);
/* Create and validate the query expression */
...
...
lib/libvarnishapi/vxp.h
View file @
3d60db6b
...
...
@@ -64,7 +64,7 @@ struct vxp {
struct
token
*
t
;
unsigned
vex_options
;
int
vre_options
;
unsigned
vre_options
;
struct
vsb
*
sb
;
int
err
;
...
...
lib/libvarnishapi/vxp_parse.c
View file @
3d60db6b
...
...
@@ -195,7 +195,7 @@ vxp_expr_lhs(struct vxp *vxp, struct vex_lhs **plhs)
}
static
void
vxp_expr_num
(
struct
vxp
*
vxp
,
struct
vex_rhs
**
prhs
,
int
vxid
)
vxp_expr_num
(
struct
vxp
*
vxp
,
struct
vex_rhs
**
prhs
,
unsigned
vxid
)
{
char
*
endptr
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment