summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2016-01-15 12:33:18 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2016-01-15 12:33:18 (GMT)
commitc90ba2a863a446b51b9ee960cead69a4b2884045 (patch) (unidiff)
treea6c36a8a15fd00f49dd3b0b46ca619563571e1f0
parent746f6355a4595cc4bbcffc89a3e42a082d757759 (diff)
downloadvmod-variable-c90ba2a863a446b51b9ee960cead69a4b2884045.tar.gz
vmod-variable-c90ba2a863a446b51b9ee960cead69a4b2884045.tar.bz2
Minor fixes.
Remove unused variables, shut gcc warnings. * src/variable.c (get_symtab): Bail out if cache fd is less than 0.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/variable.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/variable.c b/src/variable.c
index bd79c3b..e6bad1a 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -386,6 +386,8 @@ get_symtab(VARIABLE_CTX ctx)
386{ 386{
387 struct symtab *st; 387 struct symtab *st;
388 int fd = ctx->req->sp->fd; 388 int fd = ctx->req->sp->fd;
389
390 assert(fd >= 0);
389 AZ(pthread_mutex_lock(&symtab_mtx)); 391 AZ(pthread_mutex_lock(&symtab_mtx));
390 if (symtabc <= fd) { 392 if (symtabc <= fd) {
391 size_t n = fd + 1; 393 size_t n = fd + 1;
@@ -728,7 +730,6 @@ vmod_regset(VARIABLE_CTX ctx, VCL_STRING vars, VCL_STRING rxs,
728 int error_offset; 730 int error_offset;
729 int cflags = 0; 731 int cflags = 0;
730 union value value; 732 union value value;
731 char *p;
732 int ovsize; 733 int ovsize;
733 int *ovector; 734 int *ovector;
734 int i; 735 int i;
@@ -862,7 +863,7 @@ xdecode(char *s)
862 863
863 for (s = d; *s; ) { 864 for (s = d; *s; ) {
864 if (*s == '%' && hex2ul(s[1]) != -1 && hex2ul(s[2]) != -1) { 865 if (*s == '%' && hex2ul(s[1]) != -1 && hex2ul(s[2]) != -1) {
865 *d++ = hex2ul(s[1]) << 4 + hex2ul(s[2]); 866 *d++ = (hex2ul(s[1]) << 4) + hex2ul(s[2]);
866 s += 3; 867 s += 3;
867 } else 868 } else
868 *d++ = *s++; 869 *d++ = *s++;
@@ -898,7 +899,6 @@ vmod_queryset(VARIABLE_CTX ctx, VCL_STRING vars, VCL_STRING query)
898 struct symtab *vt = get_symtab(ctx); 899 struct symtab *vt = get_symtab(ctx);
899 struct vardef *head = NULL, *tail = NULL, *def; 900 struct vardef *head = NULL, *tail = NULL, *def;
900 size_t count = 0; 901 size_t count = 0;
901 size_t n;
902 const char *v = vars; 902 const char *v = vars;
903 903
904 while (*v) { 904 while (*v) {
@@ -963,7 +963,7 @@ vmod_queryset(VARIABLE_CTX ctx, VCL_STRING vars, VCL_STRING query)
963 def = vardef_new(variable_string, paramptr, paramlen, 963 def = vardef_new(variable_string, paramptr, paramlen,
964 NULL, 0); 964 NULL, 0);
965 define_param(vt, def, valptr, vallen); 965 define_param(vt, def, valptr, vallen);
966 free(def); 966 vardef_free(def);
967 } 967 }
968 } 968 }
969 vardef_free(head); 969 vardef_free(head);

Return to:

Send suggestions and report system problems to the System administrator.