From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45573 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwJIr-000121-Nj for qemu-devel@nongnu.org; Sun, 06 Mar 2011 14:07:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PwJIq-0004CI-5w for qemu-devel@nongnu.org; Sun, 06 Mar 2011 14:07:41 -0500 Received: from hall.aurel32.net ([88.191.126.93]:54554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PwJIp-0004C5-U6 for qemu-devel@nongnu.org; Sun, 06 Mar 2011 14:07:40 -0500 Date: Sun, 6 Mar 2011 20:07:36 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] net: remove parse_host_src_port() function Message-ID: <20110306190736.GH32068@volta.aurel32.net> References: <1298546530-23894-1-git-send-email-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1298546530-23894-1-git-send-email-quintela@redhat.com> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org 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 > --- > 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