mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-08-04 09:42:08 +03:00
tests: Avoid unused variables
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit ea97d41bbb
)
This commit is contained in:
@@ -1377,7 +1377,9 @@ void torture_setup_tokens(const char *temp_dir,
|
|||||||
{
|
{
|
||||||
char token_setup_start_cmd[1024] = {0};
|
char token_setup_start_cmd[1024] = {0};
|
||||||
char socket_path[1204] = {0};
|
char socket_path[1204] = {0};
|
||||||
|
#ifndef WITH_PKCS11_PROVIDER
|
||||||
char conf_path[1024] = {0};
|
char conf_path[1024] = {0};
|
||||||
|
#endif /* WITH_PKCS11_PROVIDER */
|
||||||
char *env = NULL;
|
char *env = NULL;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
@@ -1394,8 +1396,8 @@ void torture_setup_tokens(const char *temp_dir,
|
|||||||
P11_KIT_CLIENT
|
P11_KIT_CLIENT
|
||||||
#else
|
#else
|
||||||
""
|
""
|
||||||
#endif
|
#endif /* WITH_PKCS11_PROVIDER */
|
||||||
);
|
);
|
||||||
assert_int_not_equal(rc, sizeof(token_setup_start_cmd));
|
assert_int_not_equal(rc, sizeof(token_setup_start_cmd));
|
||||||
|
|
||||||
rc = system(token_setup_start_cmd);
|
rc = system(token_setup_start_cmd);
|
||||||
@@ -1419,7 +1421,7 @@ void torture_setup_tokens(const char *temp_dir,
|
|||||||
setenv("PKCS11_PROVIDER_MODULE", PKCS11SPY, 1);
|
setenv("PKCS11_PROVIDER_MODULE", PKCS11SPY, 1);
|
||||||
#else
|
#else
|
||||||
fprintf(stderr, "[ TORTURE ] >>> pkcs11-spy not found\n");
|
fprintf(stderr, "[ TORTURE ] >>> pkcs11-spy not found\n");
|
||||||
#endif
|
#endif /* PKCS11SPY */
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
(void)env;
|
(void)env;
|
||||||
@@ -1431,11 +1433,9 @@ void torture_setup_tokens(const char *temp_dir,
|
|||||||
|
|
||||||
void torture_cleanup_tokens(const char *temp_dir)
|
void torture_cleanup_tokens(const char *temp_dir)
|
||||||
{
|
{
|
||||||
char pidfile[1024] = {0};
|
|
||||||
int rc;
|
|
||||||
pid_t pid;
|
|
||||||
|
|
||||||
#ifdef WITH_PKCS11_PROVIDER
|
#ifdef WITH_PKCS11_PROVIDER
|
||||||
|
char pidfile[1024] = {0};
|
||||||
|
|
||||||
snprintf(pidfile, sizeof(pidfile), "%s/p11-kit-server.pid", temp_dir);
|
snprintf(pidfile, sizeof(pidfile), "%s/p11-kit-server.pid", temp_dir);
|
||||||
torture_terminate_process(pidfile);
|
torture_terminate_process(pidfile);
|
||||||
#else
|
#else
|
||||||
|
Reference in New Issue
Block a user