Message ID | 1351841393-32625-1-git-send-email-sw@weilnetz.de |
---|---|
State | Accepted |
Headers | show |
Am 02.11.2012 08:29, schrieb Stefan Weil: > Remove also a duplicated 'the'. > > Signed-off-by: Stefan Weil<sw@weilnetz.de> > --- > slirp/ip_icmp.c | 2 +- > tcg/tcg.h | 4 ++-- > uri.c | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c > index d571fd0..9f1cb08 100644 > --- a/slirp/ip_icmp.c > +++ b/slirp/ip_icmp.c > @@ -352,7 +352,7 @@ icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize, > > ip->ip_ttl = MAXTTL; > ip->ip_p = IPPROTO_ICMP; > - ip->ip_dst = ip->ip_src; /* ip adresses */ > + ip->ip_dst = ip->ip_src; /* ip addresses */ > ip->ip_src = m->slirp->vhost_addr; > > (void ) ip_output((struct socket *)NULL, m); > diff --git a/tcg/tcg.h b/tcg/tcg.h > index a6c9256..db86a73 100644 > --- a/tcg/tcg.h > +++ b/tcg/tcg.h > @@ -272,8 +272,8 @@ typedef int TCGv_i64; > #define TCG_CALL_DUMMY_TCGV MAKE_TCGV_I32(-1) > #define TCG_CALL_DUMMY_ARG ((TCGArg)(-1)) > > -/* Conditions. Note that these are layed out for easy manipulation by > - the the functions below: > +/* Conditions. Note that these are laid out for easy manipulation by > + the functions below: > bit 0 is used for inverting; > bit 1 is signed, > bit 2 is unsigned, > diff --git a/uri.c b/uri.c > index dd922de..138547b 100644 > --- a/uri.c > +++ b/uri.c > @@ -432,7 +432,7 @@ rfc3986_parse_host(URI *uri, const char **str) > > host = cur; > /* > - * IPv6 and future adressing scheme are enclosed between brackets > + * IPv6 and future addressing scheme are enclosed between brackets > */ > if (*cur == '[') { > cur++; > @@ -1917,7 +1917,7 @@ done: > * http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif > * > * > - * Note: if the URI reference is really wierd or complicated, it may be > + * Note: if the URI reference is really weird or complicated, it may be > * worthwhile to first convert it into a "nice" one by calling > * uri_resolve (using 'base') before calling this routine, > * since this routine (for reasonable efficiency) assumes URI has > ping?
On Sun, Nov 18, 2012 at 08:34:11PM +0100, Stefan Weil wrote: > Am 02.11.2012 08:29, schrieb Stefan Weil: > >Remove also a duplicated 'the'. > > > >Signed-off-by: Stefan Weil<sw@weilnetz.de> > >--- > > slirp/ip_icmp.c | 2 +- > > tcg/tcg.h | 4 ++-- > > uri.c | 4 ++-- > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > >diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c > >index d571fd0..9f1cb08 100644 > >--- a/slirp/ip_icmp.c > >+++ b/slirp/ip_icmp.c > >@@ -352,7 +352,7 @@ icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize, > > > > ip->ip_ttl = MAXTTL; > > ip->ip_p = IPPROTO_ICMP; > >- ip->ip_dst = ip->ip_src; /* ip adresses */ > >+ ip->ip_dst = ip->ip_src; /* ip addresses */ > > ip->ip_src = m->slirp->vhost_addr; > > > > (void ) ip_output((struct socket *)NULL, m); > >diff --git a/tcg/tcg.h b/tcg/tcg.h > >index a6c9256..db86a73 100644 > >--- a/tcg/tcg.h > >+++ b/tcg/tcg.h > >@@ -272,8 +272,8 @@ typedef int TCGv_i64; > > #define TCG_CALL_DUMMY_TCGV MAKE_TCGV_I32(-1) > > #define TCG_CALL_DUMMY_ARG ((TCGArg)(-1)) > > > >-/* Conditions. Note that these are layed out for easy manipulation by > >- the the functions below: > >+/* Conditions. Note that these are laid out for easy manipulation by > >+ the functions below: > > bit 0 is used for inverting; > > bit 1 is signed, > > bit 2 is unsigned, > >diff --git a/uri.c b/uri.c > >index dd922de..138547b 100644 > >--- a/uri.c > >+++ b/uri.c > >@@ -432,7 +432,7 @@ rfc3986_parse_host(URI *uri, const char **str) > > > > host = cur; > > /* > >- * IPv6 and future adressing scheme are enclosed between brackets > >+ * IPv6 and future addressing scheme are enclosed between brackets > > */ > > if (*cur == '[') { > > cur++; > >@@ -1917,7 +1917,7 @@ done: > > * http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif > > * > > * > >- * Note: if the URI reference is really wierd or complicated, it may be > >+ * Note: if the URI reference is really weird or complicated, it may be > > * worthwhile to first convert it into a "nice" one by calling > > * uri_resolve (using 'base') before calling this routine, > > * since this routine (for reasonable efficiency) assumes URI has > > ping? > Thanks, applied to the trivial patches tree. There is currently a pending pull request - this patch will be in the next pull request. Stefan
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index d571fd0..9f1cb08 100644 --- a/slirp/ip_icmp.c +++ b/slirp/ip_icmp.c @@ -352,7 +352,7 @@ icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize, ip->ip_ttl = MAXTTL; ip->ip_p = IPPROTO_ICMP; - ip->ip_dst = ip->ip_src; /* ip adresses */ + ip->ip_dst = ip->ip_src; /* ip addresses */ ip->ip_src = m->slirp->vhost_addr; (void ) ip_output((struct socket *)NULL, m); diff --git a/tcg/tcg.h b/tcg/tcg.h index a6c9256..db86a73 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -272,8 +272,8 @@ typedef int TCGv_i64; #define TCG_CALL_DUMMY_TCGV MAKE_TCGV_I32(-1) #define TCG_CALL_DUMMY_ARG ((TCGArg)(-1)) -/* Conditions. Note that these are layed out for easy manipulation by - the the functions below: +/* Conditions. Note that these are laid out for easy manipulation by + the functions below: bit 0 is used for inverting; bit 1 is signed, bit 2 is unsigned, diff --git a/uri.c b/uri.c index dd922de..138547b 100644 --- a/uri.c +++ b/uri.c @@ -432,7 +432,7 @@ rfc3986_parse_host(URI *uri, const char **str) host = cur; /* - * IPv6 and future adressing scheme are enclosed between brackets + * IPv6 and future addressing scheme are enclosed between brackets */ if (*cur == '[') { cur++; @@ -1917,7 +1917,7 @@ done: * http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif * * - * Note: if the URI reference is really wierd or complicated, it may be + * Note: if the URI reference is really weird or complicated, it may be * worthwhile to first convert it into a "nice" one by calling * uri_resolve (using 'base') before calling this routine, * since this routine (for reasonable efficiency) assumes URI has
Remove also a duplicated 'the'. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- slirp/ip_icmp.c | 2 +- tcg/tcg.h | 4 ++-- uri.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)