[PATCH 1/2] include: don't use c++ keyword in public header

[PATCH 1/2] include: don't use c++ keyword in public header

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

---
 include/sim.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/sim.h b/include/sim.h
index 81df60e..5e3ba5b 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -154,7 +154,7 @@ struct ofono_sim_driver {
 			ofono_sim_lock_unlock_cb_t cb, void *data);
 	void (*change_passwd)(struct ofono_sim *sim,
 			enum ofono_sim_password_type type,
-			const char *old, const char *new,
+			const char *old_passwd, const char *new_passwd,
 			ofono_sim_lock_unlock_cb_t cb, void *data);
 	void (*lock)(struct ofono_sim *sim, enum ofono_sim_password_type type,
 			int enable, const char *passwd,
-- 
1.7.3.5

[PATCH 2/2] atmodem: rename parameter according to header

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

---
 drivers/atmodem/sim.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index a9352d8..372d985 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -881,7 +881,7 @@ error:
 
 static void at_change_passwd(struct ofono_sim *sim,
 			enum ofono_sim_password_type passwd_type,
-			const char *old, const char *new,
+			const char *old_passwd, const char *new_passwd,
 			ofono_sim_lock_unlock_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
@@ -898,7 +898,7 @@ static void at_change_passwd(struct ofono_sim *sim,
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CPWD=\"%s\",\"%s\",\"%s\"",
-			at_clck_cpwd_fac[passwd_type], old, new);
+			at_clck_cpwd_fac[passwd_type], old_passwd, new_passwd);
 
 	ret = g_at_chat_send(sd->chat, buf, none_prefix,
 				at_lock_unlock_cb, cbd, g_free);
-- 
1.7.3.5

Re: [PATCH 1/2] include: don't use c++ keyword in public header

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

Hi Lucas,

>  include/sim.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

both patches have been applied. Thanks.

Regards

Marcel