slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Activity

common: const-ify more stuff in the common code.

This commit is contained in:
Solomon Peachy 2019-09-04 00:05:29 -04:00
parent 6145983ec4
commit cf4b9b0023
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend_common.c
View File

@ -347,8 +347,10 @@ static char from_hex(char ch) {
return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10;
}
/* Note -- caller must free returned pointer! */
static char *url_encode(char *str) {
char *pstr = str, *buf = malloc(strlen(str) * 3 + 1), *pbuf = buf;
static char *url_encode(const char *str) {
const char *pstr = str;
char *buf = malloc(strlen(str) * 3 + 1);
char *pbuf = buf;
if (!buf) {
ERROR("Memory allocation failure (%d bytes)\n", (int) strlen(str)*3 + 1);
@ -397,9 +399,9 @@ static char *url_decode(char *str) {
static int probe_device(struct libusb_device *device,
struct libusb_device_descriptor *desc,
const char *uri_prefix,
const char *prefix, char *manuf_override,
const char *prefix, const char *manuf_override,
int found, int num_claim_attempts,
int scan_only, char *match_serno,
int scan_only, const char *match_serno,
uint8_t *r_iface, uint8_t *r_altset,
uint8_t *r_endp_up, uint8_t *r_endp_down,
struct dyesub_backend *backend)
@ -716,8 +718,8 @@ static struct dyesub_backend *backends[] = {
static int find_and_enumerate(struct libusb_context *ctx,
struct libusb_device ***list,
struct dyesub_backend *backend,
char *match_serno,
const struct dyesub_backend *backend,
const char *match_serno,
int scan_only, int num_claim_attempts,
uint8_t *r_iface, uint8_t *r_altset,
uint8_t *r_endp_up, uint8_t *r_endp_down)
@ -789,7 +791,7 @@ static int find_and_enumerate(struct libusb_context *ctx,
return found;
}
static struct dyesub_backend *find_backend(char *uri_prefix)
static struct dyesub_backend *find_backend(const char *uri_prefix)
{
int i;
@ -853,12 +855,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n\
fprintf(stderr, "%s", license);
}
void print_help(char *argv0, struct dyesub_backend *backend)
void print_help(const char *argv0, const struct dyesub_backend *backend)
{
struct libusb_context *ctx = NULL;
struct libusb_device **list = NULL;
char *ptr = strrchr(argv0, '/');
const char *ptr = strrchr(argv0, '/');
if (ptr)
ptr++;
else
@ -1378,7 +1380,7 @@ done:
return ret;
}
void dump_markers(struct marker *markers, int marker_count, int full)
void dump_markers(const struct marker *markers, int marker_count, int full)
{
int i;
@ -1466,7 +1468,7 @@ minimal:
}
}
int dyesub_read_file(char *filename, void *databuf, int datalen,
int dyesub_read_file(const char *filename, void *databuf, int datalen,
int *actual_len)
{
int len;
@ -1516,7 +1518,7 @@ uint16_t uint16_to_packed_bcd(uint16_t val)
return bcd;
}
uint32_t packed_bcd_to_uint32(char *in, int len)
uint32_t packed_bcd_to_uint32(const char *in, int len)
{
uint32_t out = 0;
@ -1531,7 +1533,7 @@ uint32_t packed_bcd_to_uint32(char *in, int len)
}
/* Job list manipulation */
struct dyesub_joblist *dyesub_joblist_create(struct dyesub_backend *backend, void *ctx)
struct dyesub_joblist *dyesub_joblist_create(const struct dyesub_backend *backend, void *ctx)
{
struct dyesub_joblist *list;

18
backend_common.h
View File

@ -172,8 +172,8 @@ struct device_id {
uint16_t vid;
uint16_t pid;
int type; /* P_** */
char *manuf_str;
char *prefix;
const char *manuf_str;
const char *prefix;
};
struct marker {
@ -190,7 +190,7 @@ struct dyesub_backend {
const char *name;
const char *version;
const char **uri_prefixes;
uint32_t flags;
const uint32_t flags;
void (*cmdline_usage)(void); /* Optional */
void *(*init)(void);
int (*attach)(void *ctx, struct libusb_device_handle *dev, int type,
@ -209,7 +209,7 @@ struct dyesub_backend {
struct dyesub_joblist {
// TODO: mutex/lock
struct dyesub_backend *backend;
const struct dyesub_backend *backend;
void *ctx;
int num_entries;
int copies;
@ -222,16 +222,16 @@ int send_data(struct libusb_device_handle *dev, uint8_t endp,
int read_data(struct libusb_device_handle *dev, uint8_t endp,
uint8_t *buf, int buflen, int *readlen);
void dump_markers(struct marker *markers, int marker_count, int full);
void dump_markers(const struct marker *markers, int marker_count, int full);
void print_license_blurb(void);
void print_help(char *argv0, struct dyesub_backend *backend);
void print_help(const char *argv0, const struct dyesub_backend *backend);
int dyesub_read_file(char *filename, void *databuf, int datalen,
int dyesub_read_file(const char *filename, void *databuf, int datalen,
int *actual_len);
uint16_t uint16_to_packed_bcd(uint16_t val);
uint32_t packed_bcd_to_uint32(char *in, int len);
uint32_t packed_bcd_to_uint32(const char *in, int len);
void generic_teardown(void *vctx);
@ -241,7 +241,7 @@ int backend_claim_interface(struct libusb_device_handle *dev, int iface,
int num_claim_attempts);
/* Job list manipulation */
struct dyesub_joblist *dyesub_joblist_create(struct dyesub_backend *backend, void *ctx);
struct dyesub_joblist *dyesub_joblist_create(const struct dyesub_backend *backend, void *ctx);
int dyesub_joblist_addjob(struct dyesub_joblist *list, const void *job);
void dyesub_joblist_cleanup(const struct dyesub_joblist *list);
int dyesub_joblist_print(const struct dyesub_joblist *list);