diff options
| author | Jakub Wilk <jwilk@jwilk.net> | 2014-04-29 10:55:04 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-05-05 09:58:01 +0200 |
| commit | 7f4d72e11bcdfc47d4e4980349a0b0250352e6ca (patch) | |
| tree | 78a4c23dc1a2c0976bd6dca7f3f9d8dd56bbda6b | |
| parent | fb8afa1fb23135a8b7635f3f04d69a6c24626319 (diff) | |
| download | socket_wrapper-7f4d72e11bcdfc47d4e4980349a0b0250352e6ca.tar.gz socket_wrapper-7f4d72e11bcdfc47d4e4980349a0b0250352e6ca.tar.xz socket_wrapper-7f4d72e11bcdfc47d4e4980349a0b0250352e6ca.zip | |
Fix some typos.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10566
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | cmake/Modules/DefineCMakeDefaults.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/DefineInstallationPaths.cmake | 2 | ||||
| -rw-r--r-- | src/socket_wrapper.c | 8 |
4 files changed, 7 insertions, 7 deletions
@@ -18,7 +18,7 @@ is analogous to use the IPv4 addresses "127.0.0.<ID>" or IPv6 addresses should always set the default interface. If you listen on INADDR_ANY then it will use the default interface to listen on. -Exmaple: +Example: LD_PRELOAD=libsocket_wrapper.so \ SOCKET_WRAPPER_DIR=/path/to/socket_dir \ ./mydaemon diff --git a/cmake/Modules/DefineCMakeDefaults.cmake b/cmake/Modules/DefineCMakeDefaults.cmake index 22eda6f..a6cd47e 100644 --- a/cmake/Modules/DefineCMakeDefaults.cmake +++ b/cmake/Modules/DefineCMakeDefaults.cmake @@ -6,7 +6,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Put the include dirs which are in the source or build tree # before all other include dirs, so the headers in the sources -# are prefered over the already installed ones +# are preferred over the already installed ones # since cmake 2.4.1 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake index 88e08ca..a415f3d 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake @@ -104,6 +104,6 @@ else() set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-") set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-") set(ICON_INSTALL_DIR "icons" CACHE PATH "-") - set(SOUND_INSTALL_DIR "soudns" CACHE PATH "-") + set(SOUND_INSTALL_DIR "sounds" CACHE PATH "-") set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-") endif () diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 3b99814..95c5c55 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -476,7 +476,7 @@ static void *_swrap_load_lib_function(enum swrap_lib lib, const char *fn_name) /* * IMPORTANT * - * Functions expeciall from libc need to be loaded individually, you can't load + * Functions especially from libc need to be loaded individually, you can't load * all at once or gdb will segfault at startup. The same applies to valgrind and * has probably something todo with with the linker. * So we need load each function at the point it is called the first time. @@ -1601,7 +1601,7 @@ static uint8_t *swrap_packet_init(struct timeval *tval, ip->v4.tos = 0x00; ip->v4.packet_length = htons(wire_len - icmp_truncate_len); ip->v4.identification = htons(0xFFFF); - ip->v4.flags = 0x40; /* BIT 1 set - means don't fraqment */ + ip->v4.flags = 0x40; /* BIT 1 set - means don't fragment */ ip->v4.fragment = htons(0x0000); ip->v4.ttl = 0xFF; ip->v4.protocol = protocol; @@ -1640,7 +1640,7 @@ static uint8_t *swrap_packet_init(struct timeval *tval, ip->v4.tos = 0x00; ip->v4.packet_length = htons(wire_len - icmp_hdr_len); ip->v4.identification = htons(0xFFFF); - ip->v4.flags = 0x40; /* BIT 1 set - means don't fraqment */ + ip->v4.flags = 0x40; /* BIT 1 set - means don't fragment */ ip->v4.fragment = htons(0x0000); ip->v4.ttl = 0xFF; ip->v4.protocol = icmp_protocol; @@ -2395,7 +2395,7 @@ static int autobind_start; /* using sendto() or connect() on an unbound socket would give the recipient no way to reply, as unlike UDP and TCP, a unix domain - socket can't auto-assign emphemeral port numbers, so we need to + socket can't auto-assign ephemeral port numbers, so we need to assign it here. Note: this might change the family from ipv6 to ipv4 */ |