projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0af520
)
Use sizeof() more often.
author
Fabian Keil
<fk@fabiankeil.de>
Thu, 8 Mar 2007 17:41:05 +0000
(17:41 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Thu, 8 Mar 2007 17:41:05 +0000
(17:41 +0000)
cgi.c
patch
|
blob
|
history
diff --git
a/cgi.c
b/cgi.c
index
866755d
..
fac49bd
100644
(file)
--- a/
cgi.c
+++ b/
cgi.c
@@
-1,4
+1,4
@@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.9
4 2007/02/08 19:44:49
fabiankeil Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.9
5 2007/02/10 17:01:37
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@
-38,6
+38,9
@@
const char cgi_rcs[] = "$Id: cgi.c,v 1.94 2007/02/08 19:44:49 fabiankeil Exp $";
*
* Revisions :
* $Log: cgi.c,v $
*
* Revisions :
* $Log: cgi.c,v $
+ * Revision 1.95 2007/02/10 17:01:37 fabiankeil
+ * Don't overlook map result for the forwarding-type.
+ *
* Revision 1.94 2007/02/08 19:44:49 fabiankeil
* Use a transparent background for the PNG replacement pattern.
*
* Revision 1.94 2007/02/08 19:44:49 fabiankeil
* Use a transparent background for the PNG replacement pattern.
*
@@
-1875,6
+1878,9
@@
char *add_help_link(const char *item,
* HTTP header - e.g.:
* "Sun, 06 Nov 1994 08:49:37 GMT"
*
* HTTP header - e.g.:
* "Sun, 06 Nov 1994 08:49:37 GMT"
*
+ * XXX: Should probably get a third parameter for
+ * the buffer size.
+ *
* Parameters :
* 1 : time_offset = Time returned will be current time
* plus this number of seconds.
* Parameters :
* 1 : time_offset = Time returned will be current time
* plus this number of seconds.
@@
-2545,7
+2551,7
@@
struct map *default_exports(const struct client_state *csp, const char *caller)
if (!err) err = map_block_killer(exports, "can-toggle");
#endif
if (!err) err = map_block_killer(exports, "can-toggle");
#endif
- snprintf(buf,
20
, "%d", csp->config->hport);
+ snprintf(buf,
sizeof(buf)
, "%d", csp->config->hport);
if (!err) err = map(exports, "my-port", 1, buf, 1);
if(!strcmp(CODE_STATUS, "stable"))
if (!err) err = map(exports, "my-port", 1, buf, 1);
if(!strcmp(CODE_STATUS, "stable"))
@@
-2614,7
+2620,7
@@
jb_err map_block_killer(struct map *exports, const char *name)
assert(name);
assert(strlen(name) < 490);
assert(name);
assert(strlen(name) < 490);
- snprintf(buf,
1000
, "if-%s-start.*if-%s-end", name, name);
+ snprintf(buf,
sizeof(buf)
, "if-%s-start.*if-%s-end", name, name);
return map(exports, buf, 1, "", 1);
}
return map(exports, buf, 1, "", 1);
}
@@
-2644,7
+2650,7
@@
jb_err map_block_keep(struct map *exports, const char *name)
assert(name);
assert(strlen(name) < 490);
assert(name);
assert(strlen(name) < 490);
- snprintf(buf,
500
, "if-%s-start", name);
+ snprintf(buf,
sizeof(buf)
, "if-%s-start", name);
err = map(exports, buf, 1, "", 1);
if (err)
err = map(exports, buf, 1, "", 1);
if (err)
@@
-2652,7
+2658,7
@@
jb_err map_block_keep(struct map *exports, const char *name)
return err;
}
return err;
}
- snprintf(buf,
500
, "if-%s-end", name);
+ snprintf(buf,
sizeof(buf)
, "if-%s-end", name);
return map(exports, buf, 1, "", 1);
}
return map(exports, buf, 1, "", 1);
}
@@
-2691,7
+2697,7
@@
jb_err map_conditional(struct map *exports, const char *name, int choose_first)
assert(name);
assert(strlen(name) < 480);
assert(name);
assert(strlen(name) < 480);
- snprintf(buf,
1000
, (choose_first
+ snprintf(buf,
sizeof(buf)
, (choose_first
? "else-not-%s@.*@endif-%s"
: "if-%s-then@.*@else-not-%s"),
name, name);
? "else-not-%s@.*@endif-%s"
: "if-%s-then@.*@else-not-%s"),
name, name);
@@
-2702,7
+2708,7
@@
jb_err map_conditional(struct map *exports, const char *name, int choose_first)
return err;
}
return err;
}
- snprintf(buf,
1000
, (choose_first ? "if-%s-then" : "endif-%s"), name);
+ snprintf(buf,
sizeof(buf)
, (choose_first ? "if-%s-then" : "endif-%s"), name);
return map(exports, buf, 1, "", 1);
}
return map(exports, buf, 1, "", 1);
}