Merge remote-tracking branch 'origin/master'

This commit is contained in:
dongwenze 2022-12-12 15:45:37 +08:00
commit 22aee1c119
1 changed files with 2 additions and 2 deletions

View File

@ -475,7 +475,7 @@ static int delete_dhcpd_rangeset(data19 *req, const char *pRequest) {
HASH_FIND_INT(delMap, &st_addr, delItem); HASH_FIND_INT(delMap, &st_addr, delItem);
if (delItem == nullptr) { if (delItem == nullptr) {
hash_map *s = (struct hash_map *)malloc(sizeof(struct hash_map)); auto *s = (struct hash_map *)malloc(sizeof(struct hash_map));
s->key = st_addr; s->key = st_addr;
s->value = en_addr; s->value = en_addr;
HASH_ADD_INT(delMap, key, s); HASH_ADD_INT(delMap, key, s);
@ -551,7 +551,7 @@ static int delete_dhcpd_rangeset(data19 *req, const char *pRequest) {
} }
} }
cfig.rangeCount = resCount; cfig.rangeCount = (char)resCount;
const char *pStrPro = proto_create_new(pRspRoot, 200); const char *pStrPro = proto_create_new(pRspRoot, 200);
fp += sprintf(fp, "%s", pStrPro); fp += sprintf(fp, "%s", pStrPro);