mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 15:25:48 +00:00
Code Issues Releases Wiki Activity

[master]

Browse Source 
Remove unused variable.
[ISC-Bugs #31983]
This commit is contained in:
Shawn Routhier
2012-11-28 12:55:32 -08:00
parent 1e2a127bfe
commit 8acc987b9e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@@ -184,6 +184,9 @@ work on other platforms. Please report any problems and suggested fixes to
loop when the peer names are mismatched. loop when the peer names are mismatched.
[ISC-Bugs #31231] [ISC-Bugs #31231]
- Remove an unused variable to keep compilers happy
[ISC-Bugs #31983]
Changes since 4.2.3 Changes since 4.2.3
! Add a check for a null pointer before calling the regexec function. ! Add a check for a null pointer before calling the regexec function.

5
common/parse.c
View File

@@ -1850,7 +1850,6 @@ int parse_base64 (data, cfile)
struct data_string *data; struct data_string *data;
struct parse *cfile; struct parse *cfile;
{ {
enum dhcp_token token;
const char *val; const char *val;
int i, j, k; int i, j, k;
unsigned acc = 0; unsigned acc = 0;
@@ -1880,7 +1879,7 @@ int parse_base64 (data, cfile)
do { do {
unsigned l; unsigned l;
token = next_token(&val, &l, cfile); (void)next_token(&val, &l, cfile);
t = dmalloc(l + sizeof(*t), MDL); t = dmalloc(l + sizeof(*t), MDL);
if (t == NULL) if (t == NULL)
log_fatal("no memory for base64 buffer."); log_fatal("no memory for base64 buffer.");
@@ -1892,7 +1891,7 @@ int parse_base64 (data, cfile)
else else
bufs = t; bufs = t;
last = t; last = t;
token = peek_token(&val, NULL, cfile); (void)peek_token(&val, NULL, cfile);
valid_base64 = 1; valid_base64 = 1;
for (i = 0; val[i]; i++) { for (i = 0; val[i]; i++) {
/* Check to see if the character is valid. It /* Check to see if the character is valid. It