Message ID | 1351840452-481-1-git-send-email-sw@weilnetz.de |
---|---|
State | Accepted |
Headers | show |
Am 02.11.2012 08:14, schrieb Stefan Weil: > Signed-off-by: Stefan Weil<sw@weilnetz.de> > --- > configure | 2 +- > net/tap-win32.c | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/configure b/configure > index 79701ea..860859b 100755 > --- a/configure > +++ b/configure > @@ -2115,7 +2115,7 @@ if test "$pixman" = "system"; then > else > if test ! -d ${source_path}/pixman/pixman; then > echo "ERROR: pixman not present. Your options:" > - echo " (1) Prefered: Install the pixman devel package (any recent" > + echo " (1) Preferred: Install the pixman devel package (any recent" > echo " distro should have packages as Xorg needs pixman too)." > echo " (2) Fetch the pixman submodule, using:" > echo " git submodule update --init pixman" > diff --git a/net/tap-win32.c b/net/tap-win32.c > index 8d2d32b..f9bd741 100644 > --- a/net/tap-win32.c > +++ b/net/tap-win32.c > @@ -565,7 +565,7 @@ static void tap_win32_free_buffer(tap_win32_overlapped_t *overlapped, > } > > static int tap_win32_open(tap_win32_overlapped_t **phandle, > - const char *prefered_name) > + const char *preferred_name) > { > char device_path[256]; > char device_guid[0x100]; > @@ -581,8 +581,9 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle, > DWORD version_len; > DWORD idThread; > > - if (prefered_name != NULL) > - snprintf(name_buffer, sizeof(name_buffer), "%s", prefered_name); > + if (preferred_name != NULL) { > + snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); > + } > > rc = get_device_guid(device_guid, sizeof(device_guid), name_buffer, sizeof(name_buffer)); > if (rc) > ping?
On Sun, Nov 18, 2012 at 08:35:24PM +0100, Stefan Weil wrote: > Am 02.11.2012 08:14, schrieb Stefan Weil: > >Signed-off-by: Stefan Weil<sw@weilnetz.de> > >--- > > configure | 2 +- > > net/tap-win32.c | 7 ++++--- > > 2 files changed, 5 insertions(+), 4 deletions(-) > > > >diff --git a/configure b/configure > >index 79701ea..860859b 100755 > >--- a/configure > >+++ b/configure > >@@ -2115,7 +2115,7 @@ if test "$pixman" = "system"; then > > else > > if test ! -d ${source_path}/pixman/pixman; then > > echo "ERROR: pixman not present. Your options:" > >- echo " (1) Prefered: Install the pixman devel package (any recent" > >+ echo " (1) Preferred: Install the pixman devel package (any recent" > > echo " distro should have packages as Xorg needs pixman too)." > > echo " (2) Fetch the pixman submodule, using:" > > echo " git submodule update --init pixman" > >diff --git a/net/tap-win32.c b/net/tap-win32.c > >index 8d2d32b..f9bd741 100644 > >--- a/net/tap-win32.c > >+++ b/net/tap-win32.c > >@@ -565,7 +565,7 @@ static void tap_win32_free_buffer(tap_win32_overlapped_t *overlapped, > > } > > > > static int tap_win32_open(tap_win32_overlapped_t **phandle, > >- const char *prefered_name) > >+ const char *preferred_name) > > { > > char device_path[256]; > > char device_guid[0x100]; > >@@ -581,8 +581,9 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle, > > DWORD version_len; > > DWORD idThread; > > > >- if (prefered_name != NULL) > >- snprintf(name_buffer, sizeof(name_buffer), "%s", prefered_name); > >+ if (preferred_name != NULL) { > >+ snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); > >+ } > > > > rc = get_device_guid(device_guid, sizeof(device_guid), name_buffer, sizeof(name_buffer)); > > if (rc) > > ping? Thanks, applied to the trivial patches tree. Sorry I missed this one. There is currently a pending trivial patches pull request - this patch will be in the next pull request. Stefan
diff --git a/configure b/configure index 79701ea..860859b 100755 --- a/configure +++ b/configure @@ -2115,7 +2115,7 @@ if test "$pixman" = "system"; then else if test ! -d ${source_path}/pixman/pixman; then echo "ERROR: pixman not present. Your options:" - echo " (1) Prefered: Install the pixman devel package (any recent" + echo " (1) Preferred: Install the pixman devel package (any recent" echo " distro should have packages as Xorg needs pixman too)." echo " (2) Fetch the pixman submodule, using:" echo " git submodule update --init pixman" diff --git a/net/tap-win32.c b/net/tap-win32.c index 8d2d32b..f9bd741 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -565,7 +565,7 @@ static void tap_win32_free_buffer(tap_win32_overlapped_t *overlapped, } static int tap_win32_open(tap_win32_overlapped_t **phandle, - const char *prefered_name) + const char *preferred_name) { char device_path[256]; char device_guid[0x100]; @@ -581,8 +581,9 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle, DWORD version_len; DWORD idThread; - if (prefered_name != NULL) - snprintf(name_buffer, sizeof(name_buffer), "%s", prefered_name); + if (preferred_name != NULL) { + snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); + } rc = get_device_guid(device_guid, sizeof(device_guid), name_buffer, sizeof(name_buffer)); if (rc)
Signed-off-by: Stefan Weil <sw@weilnetz.de> --- configure | 2 +- net/tap-win32.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)