Skip to content

Commit

Permalink
tests: fix warnings and errors from merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jtdaugherty committed Mar 1, 2012
1 parent f3e7c7e commit 87b7ced
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion tests/ap_stubs.c
Expand Up @@ -108,7 +108,6 @@ void ap_hook_auth_checker(int (*pf)(request_rec *),
const char * const *c1,
const char * const *c2,
int nOrder) {
return 0;
}

/* Perhaps this is the top of a slippery slope, but pulling these in
Expand Down
5 changes: 1 addition & 4 deletions tests/mod_auth_cas_test.c
Expand Up @@ -577,7 +577,6 @@ char *get_attr(cas_cfg *c, cas_saml_attr *attrs, const char *attr) {
char *csvs = NULL;
cas_saml_attr_val *av;
cas_saml_attr *a;
cas_saml_attr_val *av;
for (a = attrs; a != NULL; a = a->next) {
if (strcmp(a->attr, attr) != 0) continue;
av = a->values;
Expand Down Expand Up @@ -663,7 +662,6 @@ START_TEST(isValidCASCookie_test) {
END_TEST

START_TEST(cas_curl_write_test) {
const char *data;
cas_curl_buffer cb;
const char *data = "This is some test data.";
memset(&cb, 0, sizeof(cb));
Expand Down Expand Up @@ -827,7 +825,6 @@ char *rand_str(apr_pool_t *p, unsigned int length_limit) {
/* Generate a random length from one to length_limit, inclusive.
* This method for choosing a length is biased, but it should be
* fine for testing purposes. */
char *ans;
unsigned int len;
char *ans;

Expand Down Expand Up @@ -870,7 +867,7 @@ START_TEST(cas_strnenvcmp_test) {
int l1 = strlen(rnd1);
int l2 = strlen(rnd2);
int l = l1 > l2 ? l1 : l2;
int i, a, b;
int i;

/* Comparing zero characters yields equal, regardless of the other
* inputs. */
Expand Down

0 comments on commit 87b7ced

Please sign in to comment.