Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent3
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
varnishevent3
Commits
df74fe4c
Commit
df74fe4c
authored
Jun 06, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unlearn struct cli from VCLI_WriteResult()
parent
50b7975c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
+10
-9
mgt_cli.c
bin/varnishd/mgt_cli.c
+1
-1
cli_common.h
include/cli_common.h
+1
-1
cli_common.c
lib/libvarnish/cli_common.c
+6
-6
cli_serve.c
lib/libvarnish/cli_serve.c
+2
-1
No files found.
bin/varnishd/mgt_cli.c
View file @
df74fe4c
...
@@ -400,7 +400,7 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f
...
@@ -400,7 +400,7 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f
mcf_banner
(
cli
,
NULL
,
NULL
);
mcf_banner
(
cli
,
NULL
,
NULL
);
}
}
AZ
(
VSB_finish
(
cli
->
sb
));
AZ
(
VSB_finish
(
cli
->
sb
));
(
void
)
VCLI_WriteResult
(
fdo
,
cli
);
(
void
)
VCLI_WriteResult
(
fdo
,
cli
->
result
,
VSB_data
(
cli
->
sb
)
);
ev
=
vev_new
();
ev
=
vev_new
();
...
...
include/cli_common.h
View file @
df74fe4c
...
@@ -44,7 +44,7 @@ struct cli {
...
@@ -44,7 +44,7 @@ struct cli {
struct
VCLS
*
cls
;
struct
VCLS
*
cls
;
};
};
int
VCLI_WriteResult
(
int
fd
,
const
struct
cli
*
cli
);
int
VCLI_WriteResult
(
int
fd
,
unsigned
status
,
const
char
*
result
);
int
VCLI_ReadResult
(
int
fd
,
unsigned
*
status
,
char
**
ptr
,
double
tmo
);
int
VCLI_ReadResult
(
int
fd
,
unsigned
*
status
,
char
**
ptr
,
double
tmo
);
void
VCLI_AuthResponse
(
int
S_fd
,
const
char
*
challenge
,
void
VCLI_AuthResponse
(
int
S_fd
,
const
char
*
challenge
,
...
...
lib/libvarnish/cli_common.c
View file @
df74fe4c
...
@@ -83,7 +83,7 @@ VCLI_SetResult(struct cli *cli, unsigned res)
...
@@ -83,7 +83,7 @@ VCLI_SetResult(struct cli *cli, unsigned res)
}
}
int
int
VCLI_WriteResult
(
int
fd
,
const
struct
cli
*
cli
)
VCLI_WriteResult
(
int
fd
,
unsigned
status
,
const
char
*
result
)
{
{
int
i
,
l
;
int
i
,
l
;
struct
iovec
iov
[
3
];
struct
iovec
iov
[
3
];
...
@@ -93,18 +93,18 @@ VCLI_WriteResult(int fd, const struct cli *cli)
...
@@ -93,18 +93,18 @@ VCLI_WriteResult(int fd, const struct cli *cli)
* any misformats by snprintf
* any misformats by snprintf
*/
*/
assert
(
cli
->
result
>=
100
);
assert
(
status
>=
100
);
assert
(
cli
->
result
<=
999
);
/*lint !e650 const out of range */
assert
(
status
<=
999
);
/*lint !e650 const out of range */
i
=
snprintf
(
res
,
sizeof
res
,
i
=
snprintf
(
res
,
sizeof
res
,
"%-3d %-8
ld
\n
"
,
cli
->
result
,
(
long
)
VSB_len
(
cli
->
sb
));
"%-3d %-8
jd
\n
"
,
status
,
(
intmax_t
)
strlen
(
result
));
assert
(
i
==
CLI_LINE0_LEN
);
assert
(
i
==
CLI_LINE0_LEN
);
iov
[
0
].
iov_base
=
res
;
iov
[
0
].
iov_base
=
res
;
iov
[
0
].
iov_len
=
CLI_LINE0_LEN
;
iov
[
0
].
iov_len
=
CLI_LINE0_LEN
;
iov
[
1
].
iov_base
=
VSB_data
(
cli
->
sb
);
iov
[
1
].
iov_base
=
(
void
*
)(
uintptr_t
)
result
;
/* TRUST ME */
iov
[
1
].
iov_len
=
VSB_len
(
cli
->
sb
);
iov
[
1
].
iov_len
=
strlen
(
result
);
iov
[
2
].
iov_base
=
nl
;
iov
[
2
].
iov_base
=
nl
;
iov
[
2
].
iov_len
=
1
;
iov
[
2
].
iov_len
=
1
;
...
...
lib/libvarnish/cli_serve.c
View file @
df74fe4c
...
@@ -293,7 +293,8 @@ cls_vlu2(void *priv, char * const *av)
...
@@ -293,7 +293,8 @@ cls_vlu2(void *priv, char * const *av)
cli
->
cls
=
NULL
;
cli
->
cls
=
NULL
;
if
(
VCLI_WriteResult
(
cfd
->
fdo
,
cli
)
||
cli
->
result
==
CLIS_CLOSE
)
if
(
VCLI_WriteResult
(
cfd
->
fdo
,
cli
->
result
,
VSB_data
(
cli
->
sb
))
||
cli
->
result
==
CLIS_CLOSE
)
return
(
1
);
return
(
1
);
return
(
0
);
return
(
0
);
...
...
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