Skip to contentSkip to conversation

connector: Convert char *name to const char *name

PATCH In review Joe Perches 3 participants 3 messages Feb 19, 2011 – Feb 23, 2011 1 message not in the archive

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Joe Perches

author
#1 lore raw

PATCH 1/1 connector: Convert char *name to const char *name

Allow more const declarations.

Signed-off-by Joe Perches <[email protected]>

---

Better to change the declarations and uses as this argument is not modified.

Quoted 3 lines · Javier Martinez Canillas

cn_add_callback() defines is second argument as a char * but a const char * was supplied instead. So the compiler generates a compile warning.

 drivers/connector/cn_queue.c  |    7 ++++---
 drivers/connector/connector.c |    2 +-
 include/linux/connector.h     |    9 ++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)
drivers/connector/cn_queue.c +4 -3
index 81270d2..55653ab 100644
@@ -48,7 +48,7 @@ void cn_queue_wrapper(struct work_struct *work)
 }
 
 static struct cn_callback_entry *
-cn_queue_alloc_callback_entry(char *name, struct cb_id *id,
+cn_queue_alloc_callback_entry(const char *name, struct cb_id *id,
 			      void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 	struct cn_callback_entry *cbq;

@@ -78,7 +78,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)
 	return ((i1->idx == i2->idx) && (i1->val == i2->val));
 }
 
-int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id,
+int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name,
+			  struct cb_id *id,
 			  void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 	struct cn_callback_entry *cbq, *__cbq;

@@ -135,7 +136,7 @@ void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id)
 	}
 }
 
-struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls)
+struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *nls)
 {
 	struct cn_queue_dev *dev;
drivers/connector/connector.c +1 -1
index 05117f1..f7554de 100644
@@ -205,7 +205,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
  *
  * May sleep.
  */
-int cn_add_callback(struct cb_id *id, char *name,
+int cn_add_callback(struct cb_id *id, const char *name,
 		    void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 	int err;
include/linux/connector.h +6 -3
index 2e9759c..a9edf24 100644
@@ -129,14 +129,17 @@ struct cn_dev {
 	struct cn_queue_dev *cbdev;
 };
 
-int cn_add_callback(struct cb_id *, char *, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));
+int cn_add_callback(struct cb_id *id, const char *name,
+		    void (*callback)(struct cn_msg *, struct netlink_skb_parms *));
 void cn_del_callback(struct cb_id *);
 int cn_netlink_send(struct cn_msg *, u32, gfp_t);
 
-int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(struct cn_msg *, struct netlink_skb_parms *));
+int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name,
+			  struct cb_id *id,
+			  void (*callback)(struct cn_msg *, struct netlink_skb_parms *));
 void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
 
-struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *);
+struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *);
 void cn_queue_free_dev(struct cn_queue_dev *dev);
 
 int cn_cb_equal(struct cb_id *, struct cb_id *);
#3 lore raw
Quoted 9 lines · Evgeniy Polyakov

Hi Joe.

Quoted 6 lines · Joe Perches

Allow more const declarations.

Signed-off-by Joe Perches <[email protected]>

---

Quoted 7 lines
Quoted 2 lines

Better to change the declarations and uses as this argument is not modified.

Looks good, thank you.
Greg, please push it into your tree.

Acked-by Evgeniy Polyakov <[email protected]>

Now applied, thanks.

greg k-h