preparatory patch for -Wwrite-strings #2
This commit is contained in:
@@ -89,8 +89,8 @@ void udhcp_sp_setup(void);
|
||||
int udhcp_sp_fd_set(fd_set *rfds, int extra_fd);
|
||||
int udhcp_sp_read(fd_set *rfds);
|
||||
int raw_socket(int ifindex);
|
||||
int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp);
|
||||
int listen_socket(uint32_t ip, int port, char *inf);
|
||||
int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp);
|
||||
int listen_socket(uint32_t ip, int port, const char *inf);
|
||||
int pidfile_acquire(const char *pidfile);
|
||||
void pidfile_write_release(int pid_fd);
|
||||
int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *arp, char *interface);
|
||||
|
||||
@@ -20,9 +20,9 @@ struct client_config_t {
|
||||
char release_on_quit; /* perform release on quit */
|
||||
char abort_if_no_lease; /* Abort if no lease */
|
||||
char background_if_no_lease; /* Fork to background if no lease */
|
||||
char *interface; /* The name of the interface to use */
|
||||
const char *interface; /* The name of the interface to use */
|
||||
char *pidfile; /* Optionally store the process ID */
|
||||
char *script; /* User script to run at dhcp events */
|
||||
const char *script; /* User script to run at dhcp events */
|
||||
uint8_t *clientid; /* Optional client id to use */
|
||||
uint8_t *vendorclass; /* Optional vendor class-id to use */
|
||||
uint8_t *hostname; /* Optional hostname to use */
|
||||
|
||||
@@ -35,7 +35,7 @@ static inline int upper_length(int length, int opt_index)
|
||||
}
|
||||
|
||||
|
||||
static int sprintip(char *dest, char *pre, uint8_t *ip)
|
||||
static int sprintip(char *dest, const char *pre, const uint8_t *ip)
|
||||
{
|
||||
return sprintf(dest, "%s%d.%d.%d.%d", pre, ip[0], ip[1], ip[2], ip[3]);
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "common.h"
|
||||
|
||||
|
||||
int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
|
||||
int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
|
||||
{
|
||||
int fd;
|
||||
struct ifreq ifr;
|
||||
@@ -88,7 +88,7 @@ int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
|
||||
}
|
||||
|
||||
|
||||
int listen_socket(uint32_t ip, int port, char *inf)
|
||||
int listen_socket(uint32_t ip, int port, const char *inf)
|
||||
{
|
||||
struct ifreq interface;
|
||||
int fd;
|
||||
|
||||
Reference in New Issue
Block a user