diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:34:29 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:34:29 -0600 |
| commit | 7c12fd9b29c6ca2119396f143d84706f2fba6222 (patch) | |
| tree | 4aec8a23b6899c8ef34e716b2328f5d443663503 /net/tap-win32.c | |
| parent | 8385b173a0ca4c2345434104e6cc2a7259adc4b9 (diff) | |
| parent | 654598c944aa31cdbea435bd468055af9c918d16 (diff) | |
| download | qemu-7c12fd9b29c6ca2119396f143d84706f2fba6222.zip qemu-7c12fd9b29c6ca2119396f143d84706f2fba6222.tar.gz qemu-7c12fd9b29c6ca2119396f143d84706f2fba6222.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path
qemu-options: Fix space at EOL
Fix spelling in comments and documentation
Clean up pci_drive_hot_add()'s use of BlockInterfaceType
arm: a9mpcore: remove un-used ptimer_iomem field
target-sparc: Remove t0, t1 from CPUSPARCState
target-m68k: Remove t1 from CPUM68KState
target-alpha: Remove t0, t1 from CPUAlphaState
s390x: Spelling fixes (endianess -> endianness, occured -> occurred)
Fix comments (adress -> address, layed -> laid, wierd -> weird)
Fix spelling (prefered -> preferred)
configure: Remove stray debug output
sd: Send debug printfery to stderr not stdout
Conflicts:
configure
Resolve spelling conflict in configure.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net/tap-win32.c')
| -rw-r--r-- | net/tap-win32.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) |