[Qemu-devel] [PATCH] net: remove parse_host_src_port() function

[Qemu-devel] [PATCH] net: remove parse_host_src_port() function

[Juan Quintela]

It was deprecated, and it has no users.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 net.c         |   41 -----------------------------------------
 qemu_socket.h |    3 ---
 2 files changed, 0 insertions(+), 44 deletions(-)

diff --git a/net.c b/net.c
index ec4745d..4c3e083 100644
--- a/net.c
+++ b/net.c
@@ -93,47 +93,6 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
     return 0;
 }

-int parse_host_src_port(struct sockaddr_in *haddr,
-                        struct sockaddr_in *saddr,
-                        const char *input_str)
-{
-    char *str = qemu_strdup(input_str);
-    char *host_str = str;
-    char *src_str;
-    const char *src_str2;
-    char *ptr;
-
-    /*
-     * Chop off any extra arguments at the end of the string which
-     * would start with a comma, then fill in the src port information
-     * if it was provided else use the "any address" and "any port".
-     */
-    if ((ptr = strchr(str,',')))
-        *ptr = '\0';
-
-    if ((src_str = strchr(input_str,'@'))) {
-        *src_str = '\0';
-        src_str++;
-    }
-
-    if (parse_host_port(haddr, host_str) < 0)
-        goto fail;
-
-    src_str2 = src_str;
-    if (!src_str || *src_str == '\0')
-        src_str2 = ":0";
-
-    if (parse_host_port(saddr, src_str2) < 0)
-        goto fail;
-
-    free(str);
-    return(0);
-
-fail:
-    free(str);
-    return -1;
-}
-
 int parse_host_port(struct sockaddr_in *saddr, const char *str)
 {
     char buf[512];
diff --git a/qemu_socket.h b/qemu_socket.h
index 897a8ae..180e4db 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -54,9 +54,6 @@ int unix_connect(const char *path);

 /* Old, ipv4 only bits.  Don't use for new code. */
 int parse_host_port(struct sockaddr_in *saddr, const char *str);
-int parse_host_src_port(struct sockaddr_in *haddr,
-                        struct sockaddr_in *saddr,
-                        const char *str);
 int socket_init(void);

 #endif /* QEMU_SOCKET_H */
-- 
1.7.4

Re: [Qemu-devel] [PATCH] net: remove parse_host_src_port() function

[Aurelien Jarno]

On Thu, Feb 24, 2011 at 12:22:10PM +0100, Juan Quintela wrote:
> It was deprecated, and it has no users.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  net.c         |   41 -----------------------------------------
>  qemu_socket.h |    3 ---
>  2 files changed, 0 insertions(+), 44 deletions(-)

Thanks, applied.

> diff --git a/net.c b/net.c
> index ec4745d..4c3e083 100644
> --- a/net.c
> +++ b/net.c
> @@ -93,47 +93,6 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
>      return 0;
>  }
> 
> -int parse_host_src_port(struct sockaddr_in *haddr,
> -                        struct sockaddr_in *saddr,
> -                        const char *input_str)
> -{
> -    char *str = qemu_strdup(input_str);
> -    char *host_str = str;
> -    char *src_str;
> -    const char *src_str2;
> -    char *ptr;
> -
> -    /*
> -     * Chop off any extra arguments at the end of the string which
> -     * would start with a comma, then fill in the src port information
> -     * if it was provided else use the "any address" and "any port".
> -     */
> -    if ((ptr = strchr(str,',')))
> -        *ptr = '\0';
> -
> -    if ((src_str = strchr(input_str,'@'))) {
> -        *src_str = '\0';
> -        src_str++;
> -    }
> -
> -    if (parse_host_port(haddr, host_str) < 0)
> -        goto fail;
> -
> -    src_str2 = src_str;
> -    if (!src_str || *src_str == '\0')
> -        src_str2 = ":0";
> -
> -    if (parse_host_port(saddr, src_str2) < 0)
> -        goto fail;
> -
> -    free(str);
> -    return(0);
> -
> -fail:
> -    free(str);
> -    return -1;
> -}
> -
>  int parse_host_port(struct sockaddr_in *saddr, const char *str)
>  {
>      char buf[512];
> diff --git a/qemu_socket.h b/qemu_socket.h
> index 897a8ae..180e4db 100644
> --- a/qemu_socket.h
> +++ b/qemu_socket.h
> @@ -54,9 +54,6 @@ int unix_connect(const char *path);
> 
>  /* Old, ipv4 only bits.  Don't use for new code. */
>  int parse_host_port(struct sockaddr_in *saddr, const char *str);
> -int parse_host_src_port(struct sockaddr_in *haddr,
> -                        struct sockaddr_in *saddr,
> -                        const char *str);
>  int socket_init(void);
> 
>  #endif /* QEMU_SOCKET_H */
> -- 
> 1.7.4
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net