linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] obexd: Remove unused parameter from manager_request_authorization
@ 2015-03-12 11:42 Szymon Janc
  2015-04-08 10:39 ` Szymon Janc
  0 siblings, 1 reply; 2+ messages in thread
From: Szymon Janc @ 2015-03-12 11:42 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Szymon Janc

This fix compilation error with musl due to missing (now not needed)
stdint.h include.
---
 obexd/plugins/opp.c | 4 +---
 obexd/src/manager.c | 2 +-
 obexd/src/manager.h | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index 5228ba8..445688d 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -62,7 +62,6 @@ static void opp_progress(struct obex_session *os, void *user_data)
 static int opp_chkput(struct obex_session *os, void *user_data)
 {
 	char *folder, *name, *path;
-	int32_t time;
 	const char *t;
 	int err;
 
@@ -79,8 +78,7 @@ static int opp_chkput(struct obex_session *os, void *user_data)
 		goto skip_auth;
 	}
 
-	time = 0;
-	err = manager_request_authorization(user_data, time, &folder, &name);
+	err = manager_request_authorization(user_data, &folder, &name);
 	if (err < 0)
 		return -EPERM;
 
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 371f127..f84384a 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -671,7 +671,7 @@ static gboolean auth_error(GIOChannel *io, GIOCondition cond, void *user_data)
 	return FALSE;
 }
 
-int manager_request_authorization(struct obex_transfer *transfer, int32_t time,
+int manager_request_authorization(struct obex_transfer *transfer,
 					char **new_folder, char **new_name)
 {
 	struct obex_session *os = transfer->session;
diff --git a/obexd/src/manager.h b/obexd/src/manager.h
index 669b223..d9781b2 100644
--- a/obexd/src/manager.h
+++ b/obexd/src/manager.h
@@ -36,7 +36,7 @@ void manager_unregister_transfer(struct obex_transfer *transfer);
 void manager_emit_transfer_started(struct obex_transfer *transfer);
 void manager_emit_transfer_progress(struct obex_transfer *transfer);
 void manager_emit_transfer_completed(struct obex_transfer *transfer);
-int manager_request_authorization(struct obex_transfer *transfer, int32_t time,
+int manager_request_authorization(struct obex_transfer *transfer,
 					char **new_folder, char **new_name);
 
 DBusConnection *manager_dbus_get_connection(void);
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] obexd: Remove unused parameter from manager_request_authorization
  2015-03-12 11:42 [PATCH] obexd: Remove unused parameter from manager_request_authorization Szymon Janc
@ 2015-04-08 10:39 ` Szymon Janc
  0 siblings, 0 replies; 2+ messages in thread
From: Szymon Janc @ 2015-04-08 10:39 UTC (permalink / raw)
  To: linux-bluetooth

On Thursday 12 of March 2015 12:42:59 Szymon Janc wrote:
> This fix compilation error with musl due to missing (now not needed)
> stdint.h include.
> ---
>  obexd/plugins/opp.c | 4 +---
>  obexd/src/manager.c | 2 +-
>  obexd/src/manager.h | 2 +-
>  3 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
> index 5228ba8..445688d 100644
> --- a/obexd/plugins/opp.c
> +++ b/obexd/plugins/opp.c
> @@ -62,7 +62,6 @@ static void opp_progress(struct obex_session *os, void
> *user_data) static int opp_chkput(struct obex_session *os, void *user_data)
>  {
>  	char *folder, *name, *path;
> -	int32_t time;
>  	const char *t;
>  	int err;
> 
> @@ -79,8 +78,7 @@ static int opp_chkput(struct obex_session *os, void
> *user_data) goto skip_auth;
>  	}
> 
> -	time = 0;
> -	err = manager_request_authorization(user_data, time, &folder, &name);
> +	err = manager_request_authorization(user_data, &folder, &name);
>  	if (err < 0)
>  		return -EPERM;
> 
> diff --git a/obexd/src/manager.c b/obexd/src/manager.c
> index 371f127..f84384a 100644
> --- a/obexd/src/manager.c
> +++ b/obexd/src/manager.c
> @@ -671,7 +671,7 @@ static gboolean auth_error(GIOChannel *io, GIOCondition
> cond, void *user_data) return FALSE;
>  }
> 
> -int manager_request_authorization(struct obex_transfer *transfer, int32_t
> time, +int manager_request_authorization(struct obex_transfer *transfer,
> char **new_folder, char **new_name)
>  {
>  	struct obex_session *os = transfer->session;
> diff --git a/obexd/src/manager.h b/obexd/src/manager.h
> index 669b223..d9781b2 100644
> --- a/obexd/src/manager.h
> +++ b/obexd/src/manager.h
> @@ -36,7 +36,7 @@ void manager_unregister_transfer(struct obex_transfer
> *transfer); void manager_emit_transfer_started(struct obex_transfer
> *transfer); void manager_emit_transfer_progress(struct obex_transfer
> *transfer); void manager_emit_transfer_completed(struct obex_transfer
> *transfer); -int manager_request_authorization(struct obex_transfer
> *transfer, int32_t time, +int manager_request_authorization(struct
> obex_transfer *transfer, char **new_folder, char **new_name);
> 
>  DBusConnection *manager_dbus_get_connection(void);

Applied.
-- 
BR
Szymon Janc

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-08 10:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-12 11:42 [PATCH] obexd: Remove unused parameter from manager_request_authorization Szymon Janc
2015-04-08 10:39 ` Szymon Janc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).