From e2138fee2003ea099792badcb2f69ff734e7cbf9 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 24 Jan 2001 01:46:18 +0000 Subject: [PATCH] Const'ify cam_sim.sim_name to quiet warnings. Reviewed by: -scsi --- sys/cam/cam_sim.c | 2 +- sys/cam/cam_sim.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c index c8843e24c82..b7e0ec5bdf5 100644 --- a/sys/cam/cam_sim.c +++ b/sys/cam/cam_sim.c @@ -53,7 +53,7 @@ cam_simq_free(struct cam_devq *devq) struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, - char *sim_name, void *softc, u_int32_t unit, + const char *sim_name, void *softc, u_int32_t unit, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue) { diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h index 95e6dcebd15..fb6b1a4c71d 100644 --- a/sys/cam/cam_sim.h +++ b/sys/cam/cam_sim.h @@ -53,7 +53,7 @@ void cam_simq_free(struct cam_devq *devq); struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, - char *sim_name, + const char *sim_name, void *softc, u_int32_t unit, int max_dev_transactions, @@ -67,11 +67,11 @@ void cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id); /* Convenience routines for accessing sim attributes. */ -static __inline u_int32_t cam_sim_path(struct cam_sim *sim); -static __inline char * cam_sim_name(struct cam_sim *sim); -static __inline void * cam_sim_softc(struct cam_sim *sim); -static __inline u_int32_t cam_sim_unit(struct cam_sim *sim); -static __inline u_int32_t cam_sim_bus(struct cam_sim *sim); +static __inline u_int32_t cam_sim_path(struct cam_sim *sim); +static __inline const char * cam_sim_name(struct cam_sim *sim); +static __inline void * cam_sim_softc(struct cam_sim *sim); +static __inline u_int32_t cam_sim_unit(struct cam_sim *sim); +static __inline u_int32_t cam_sim_bus(struct cam_sim *sim); @@ -88,7 +88,7 @@ static __inline u_int32_t cam_sim_bus(struct cam_sim *sim); struct cam_sim { sim_action_func sim_action; sim_poll_func sim_poll; - char *sim_name; + const char *sim_name; void *softc; u_int32_t path_id;/* The Boot device may set this to 0? */ u_int32_t unit_number; @@ -107,7 +107,7 @@ cam_sim_path(struct cam_sim *sim) return (sim->path_id); } -static __inline char * +static __inline const char * cam_sim_name(struct cam_sim *sim) { return (sim->sim_name);