Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
635bc5f3
Commit
635bc5f3
authored
Nov 20, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give libvarnishapi a good flexelinting
parent
d68a7210
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
24 deletions
+24
-24
flint.lnt
bin/varnishtest/flint.lnt
+2
-0
flint.sh
bin/varnishtest/flint.sh
+2
-1
vsc.h
include/vapi/vsc.h
+2
-2
vsm.h
include/vapi/vsm.h
+6
-6
vsc.c
lib/libvarnishapi/vsc.c
+2
-2
vsl.c
lib/libvarnishapi/vsl.c
+3
-2
vsm.c
lib/libvarnishapi/vsm.c
+7
-8
vsm_api.h
lib/libvarnishapi/vsm_api.h
+0
-3
No files found.
bin/varnishtest/flint.lnt
View file @
635bc5f3
-esym(850, av)
-esym(785, VSL_tags)
-esym(528, iter_call) // Flexelint bug
-e712 // 14 Info 712 Loss of precision (___) (___ to ___)
-e747 // 16 Info 747 Significant prototype coercion (___) ___ to ___
...
...
bin/varnishtest/flint.sh
View file @
635bc5f3
...
...
@@ -9,4 +9,5 @@ flexelint \
-I
../..
\
../flint.lnt
\
flint.lnt
\
*
.c
*
.c
\
../../lib/libvarnishapi/
*
.c
include/vapi/vsc.h
View file @
635bc5f3
...
...
@@ -66,7 +66,7 @@ int VSC_Open(struct VSM_data *vd, int diag);
* args and returns as VSM_Open()
*/
struct
VSC_C_main
*
VSC_Main
(
struct
VSM_data
*
vd
);
struct
VSC_C_main
*
VSC_Main
(
const
struct
VSM_data
*
vd
);
/*
* return Main stats structure
* returns NULL until child has been started.
...
...
@@ -84,7 +84,7 @@ struct VSC_point {
typedef
int
VSC_iter_f
(
void
*
priv
,
const
struct
VSC_point
*
const
pt
);
int
VSC_Iter
(
struct
VSM_data
*
vd
,
VSC_iter_f
*
func
,
void
*
priv
);
int
VSC_Iter
(
const
struct
VSM_data
*
vd
,
VSC_iter_f
*
func
,
void
*
priv
);
/*
* Iterate over all statistics counters, calling "func" for
* each counter not suppressed by any "-f" arguments.
...
...
include/vapi/vsm.h
View file @
635bc5f3
...
...
@@ -126,8 +126,8 @@ struct VSM_head *VSM_Head(const struct VSM_data *vd);
* Return the head of the VSM.
*/
void
VSM__iter0
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
);
int
VSM__itern
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
);
void
VSM__iter0
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
);
int
VSM__itern
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
);
#define VSM_FOREACH_SAFE(vf, vd) \
for(VSM__iter0((vd), (vf)); VSM__itern((vd), (vf));)
...
...
@@ -137,7 +137,7 @@ int VSM__itern(struct VSM_data *vd, struct VSM_fantom *vf);
* vd = "struct VSM_data *"
*/
int
VSM_StillValid
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
);
int
VSM_StillValid
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
);
/*
* Return:
* 0: fantom is invalid now.
...
...
@@ -145,8 +145,8 @@ int VSM_StillValid(struct VSM_data *vd, struct VSM_fantom *vf);
* 2: a fantom with same dimensions exist, check class/type/ident
*/
int
VSM_Get
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
);
int
VSM_Get
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
);
/*
* Find a chunk, produce fantom for it.
* Returns zero on failure.
...
...
@@ -166,7 +166,7 @@ void VSM_Close(struct VSM_data *vd);
*/
/* OBSOLETE: Will disappear from Varnish 4.x */
void
*
VSM_Find_Chunk
(
struct
VSM_data
*
vd
,
const
char
*
class
,
void
*
VSM_Find_Chunk
(
const
struct
VSM_data
*
vd
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
,
unsigned
*
lenp
);
/*
* Find a given chunk in the shared memory.
...
...
lib/libvarnishapi/vsc.c
View file @
635bc5f3
...
...
@@ -222,7 +222,7 @@ VSC_Open(struct VSM_data *vd, int diag)
/*--------------------------------------------------------------------*/
struct
VSC_C_main
*
VSC_Main
(
struct
VSM_data
*
vd
)
VSC_Main
(
const
struct
VSM_data
*
vd
)
{
struct
VSM_fantom
vf
;
...
...
@@ -316,7 +316,7 @@ iter_call(const struct vsc *vsc, VSC_iter_f *func, void *priv,
#undef VSC_DONE
int
VSC_Iter
(
struct
VSM_data
*
vd
,
VSC_iter_f
*
func
,
void
*
priv
)
VSC_Iter
(
const
struct
VSM_data
*
vd
,
VSC_iter_f
*
func
,
void
*
priv
)
{
struct
vsc
*
vsc
;
struct
VSM_fantom
vf
;
...
...
lib/libvarnishapi/vsl.c
View file @
635bc5f3
...
...
@@ -294,7 +294,7 @@ VSL_Dispatch(struct VSM_data *vd, VSL_handler_f *func, void *priv)
s
|=
VSL_S_CLIENT
;
if
(
VSL_BACKEND
(
p
))
s
|=
VSL_S_BACKEND
;
if
(
func
(
priv
,
VSL_TAG
(
p
),
u
,
l
,
s
,
VSL_DATA
(
p
),
bitmap
))
if
(
func
(
priv
,
(
enum
VSL_tag_e
)
VSL_TAG
(
p
),
u
,
l
,
s
,
VSL_DATA
(
p
),
bitmap
))
return
(
1
);
}
}
...
...
@@ -326,7 +326,8 @@ VSL_H_Print(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
fprintf
(
fo
,
"
\"\n
"
);
return
(
0
);
}
fprintf
(
fo
,
"%5u %-12s %c %.*s
\n
"
,
fd
,
VSL_tags
[
tag
],
type
,
len
,
ptr
);
fprintf
(
fo
,
"%5u %-12s %c %.*s
\n
"
,
fd
,
VSL_tags
[
tag
],
type
,
(
int
)
len
,
ptr
);
return
(
0
);
}
...
...
lib/libvarnishapi/vsm.c
View file @
635bc5f3
...
...
@@ -46,7 +46,6 @@
#include "vapi/vsm.h"
#include "vapi/vsm_int.h"
#include "vbm.h"
#include "vin.h"
#include "vsm_api.h"
...
...
@@ -288,7 +287,7 @@ VSM_Head(const struct VSM_data *vd)
/*--------------------------------------------------------------------*/
void
VSM__iter0
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
)
VSM__iter0
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
)
{
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
...
...
@@ -296,7 +295,7 @@ VSM__iter0(struct VSM_data *vd, struct VSM_fantom *vf)
}
int
VSM__itern
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
)
VSM__itern
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
)
{
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
...
...
@@ -327,7 +326,7 @@ VSM__itern(struct VSM_data *vd, struct VSM_fantom *vf)
/*--------------------------------------------------------------------*/
int
VSM_StillValid
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
)
VSM_StillValid
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
)
{
struct
VSM_fantom
f2
;
...
...
@@ -346,8 +345,8 @@ VSM_StillValid(struct VSM_data *vd, struct VSM_fantom *vf)
}
int
VSM_Get
(
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
)
VSM_Get
(
const
struct
VSM_data
*
vd
,
struct
VSM_fantom
*
vf
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
)
{
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
...
...
@@ -367,8 +366,8 @@ VSM_Get(struct VSM_data *vd, struct VSM_fantom *vf, const char *class,
/*--------------------------------------------------------------------*/
void
*
VSM_Find_Chunk
(
struct
VSM_data
*
vd
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
,
unsigned
*
lenp
)
VSM_Find_Chunk
(
const
struct
VSM_data
*
vd
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
,
unsigned
*
lenp
)
{
struct
VSM_fantom
vf
;
...
...
lib/libvarnishapi/vsm_api.h
View file @
635bc5f3
...
...
@@ -56,8 +56,5 @@ struct VSM_data {
struct
vsl
*
vsl
;
};
struct
VSM_chunk
*
VSM_find_alloc
(
struct
VSM_data
*
vd
,
const
char
*
class
,
const
char
*
type
,
const
char
*
ident
);
void
VSC_Delete
(
struct
VSM_data
*
vd
);
void
VSL_Delete
(
struct
VSM_data
*
vd
);
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