rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 14:37:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2018-02-01

Browse Source 
Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-20 15:53:03 +02:00
parent bb80d9df8b
commit 18fa92c2dc
356 changed files with 6598 additions and 3376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
freebsd/sbin/dhclient/parse.c
View File

@@ -47,6 +47,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <stdbool.h>
#include "dhcpd.h"
#include "dhctoken.h"
@@ -160,7 +162,8 @@ void
parse_hardware_param(FILE *cfile, struct hardware *hardware)
{
unsigned char *t;
int token, hlen;
int token;
size_t hlen;
char *val;
token = next_token(&val, cfile);
@@ -244,13 +247,13 @@ parse_lease_time(FILE *cfile, time_t *timep)
* tokenized.
*/
unsigned char *
parse_numeric_aggregate(FILE *cfile, unsigned char *buf, int *max,
int separator, int base, int size)
parse_numeric_aggregate(FILE *cfile, unsigned char *buf, size_t *max,
int separator, unsigned base, int size)
{
unsigned char *bufp = buf, *s = NULL;
int token, count = 0;
int token;
char *val, *t;
size_t valsize;
size_t valsize, count = 0;
pair c = NULL;
unsigned char *lbufp = NULL;
@@ -331,14 +334,15 @@ parse_numeric_aggregate(FILE *cfile, unsigned char *buf, int *max,
}
void
convert_num(unsigned char *buf, char *str, int base, int size)
convert_num(unsigned char *buf, char *str, unsigned base, int size)
{
int negative = 0, tval, max;
bool negative = false;
unsigned tval, max;
u_int32_t val = 0;
char *ptr = str;
if (*ptr == '-') {
negative = 1;
negative = true;
ptr++;
}