Patchwork [trivial] slirp: cleanup leftovers from misc.h

login
register
mail settings
Submitter Michael Tokarev
Date May 27, 2013, 8:51 p.m.
Message ID <1369687911-9731-1-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/246658/
State New
Headers show

Comments

Michael Tokarev - May 27, 2013, 8:51 p.m.
There are quite a few leftover declarations in slirp/misc.h.
Remove them.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 slirp/misc.h |   14 --------------
 1 file changed, 14 deletions(-)

I'm not entirely sure we should do this, since this kind of
changes just moves us more and more away from the upstream, but...
Jan Kiszka - May 29, 2013, 6:59 a.m.
On 2013-05-28 05:51, Michael Tokarev wrote:
> There are quite a few leftover declarations in slirp/misc.h.
> Remove them.
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  slirp/misc.h |   14 --------------
>  1 file changed, 14 deletions(-)
> 
> I'm not entirely sure we should do this, since this kind of
> changes just moves us more and more away from the upstream, but...

AFAIK, there is no upstream worth tracking, so this is fine.

Jan

> 
> diff --git a/slirp/misc.h b/slirp/misc.h
> index cc36aeb..ba8beb1 100644
> --- a/slirp/misc.h
> +++ b/slirp/misc.h
> @@ -20,8 +20,6 @@ struct ex_list {
>  char *strdup(const char *);
>  #endif
>  
> -void do_wait(int);
> -
>  #define EMU_NONE 0x0
>  
>  /* TCP emulations */
> @@ -51,21 +49,9 @@ struct emu_t {
>      struct emu_t *next;
>  };
>  
> -extern int x_port, x_server, x_display;
> -
> -int show_x(char *, struct socket *);
> -void redir_x(uint32_t, int, int, int);
>  void slirp_insque(void *, void *);
>  void slirp_remque(void *);
>  int add_exec(struct ex_list **, int, char *, struct in_addr, int);
> -int slirp_openpty(int *, int *);
>  int fork_exec(struct socket *so, const char *ex, int do_pty);
> -void snooze_hup(int);
> -void snooze(void);
> -void relay(int);
> -void add_emu(char *);
> -void fd_nonblock(int);
> -void fd_block(int);
> -int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
>  
>  #endif
>

Patch

diff --git a/slirp/misc.h b/slirp/misc.h
index cc36aeb..ba8beb1 100644
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -20,8 +20,6 @@  struct ex_list {
 char *strdup(const char *);
 #endif
 
-void do_wait(int);
-
 #define EMU_NONE 0x0
 
 /* TCP emulations */
@@ -51,21 +49,9 @@  struct emu_t {
     struct emu_t *next;
 };
 
-extern int x_port, x_server, x_display;
-
-int show_x(char *, struct socket *);
-void redir_x(uint32_t, int, int, int);
 void slirp_insque(void *, void *);
 void slirp_remque(void *);
 int add_exec(struct ex_list **, int, char *, struct in_addr, int);
-int slirp_openpty(int *, int *);
 int fork_exec(struct socket *so, const char *ex, int do_pty);
-void snooze_hup(int);
-void snooze(void);
-void relay(int);
-void add_emu(char *);
-void fd_nonblock(int);
-void fd_block(int);
-int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
 
 #endif