[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Mon Feb 22 13:46:33 MST 2010
The branch, master has been updated
via 1e986c1... More spelling fixes across source4/
via 7a23b97... Various source4 spelling fixes.
via 4b02468... Spelling fixes for source4/auth.
via 3eacc83... Spelling fixes for source4/lib/registry.
via 7def87c... Typo fix.
via 1683d09... LDB related spelling fixes.
via dd89dc2... Spelling fixes for libutil
via e4c2f4d... Spelling fixes in lib/zlib.
via 198b17a... Spelling fixes for libreplace.
via 319d3bf... Spelling fixes for tsocket API documentation.
via 11b211c... Spelling fixes for lib/compression.
via 7863bb1... Spelling fixes for nss_wrapper.
via 842fb05... Spelling fixes for popt API documentation.
via 119a823... Spelling fixes for tevent.
via 09e756b... Spelling fixes for tdb.
from 6de98ba... s4:torture/ldap/basic.c - add some "const"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1e986c1cb3243f7f7de4e7866e78584615ecd13e
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 17:46:46 2010 +1100
More spelling fixes across source4/
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 7a23b9769be2c3c25cfb8fa280efb0ab34cd24b2
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 17:35:11 2010 +1100
Various source4 spelling fixes.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 4b024683acba72c1b8618155a45f32e6437878d1
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 17:33:28 2010 +1100
Spelling fixes for source4/auth.
The comment for USER_INFO_INTERACTIVE_LOGON looks like a cut-n-paste from the line above.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 3eacc83b35f65603e41bc36d6c42608fc22912f6
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 17:24:08 2010 +1100
Spelling fixes for source4/lib/registry.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 7def87cb17edac48ed21041e6cbbda372a8a46da
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 17:23:15 2010 +1100
Typo fix.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 1683d090ccfb8b2959e091bdb9281a4991d943dc
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 17:22:45 2010 +1100
LDB related spelling fixes.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit dd89dc2c3166d4bbcb3aacfb7222488c69e10485
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:58:07 2010 +1100
Spelling fixes for libutil
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit e4c2f4dc75ad38bfeb7c8b8015a48b6b49b22b90
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:51:01 2010 +1100
Spelling fixes in lib/zlib.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 198b17abf0c8d1d07f4e22a757acd60d4a570af4
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:35:10 2010 +1100
Spelling fixes for libreplace.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 319d3bf9d93ddfc1afbfb0c759f6d91906f915c1
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:34:22 2010 +1100
Spelling fixes for tsocket API documentation.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 11b211cf989ab3f6d4d3aa352e3fc8163ea09d72
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:33:24 2010 +1100
Spelling fixes for lib/compression.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 7863bb1511aac0234d1beb48f8163bbc67fc2588
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:32:29 2010 +1100
Spelling fixes for nss_wrapper.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 842fb05b1111fbf607f05f51d2f271d32bd052a8
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:31:46 2010 +1100
Spelling fixes for popt API documentation.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 119a8230ebeaf1eb95682a3d5c7b8675791c02fd
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:31:01 2010 +1100
Spelling fixes for tevent.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
commit 09e756b1d651caef203a4b7e02234f6dea374b08
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:07:43 2010 +1100
Spelling fixes for tdb.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
-----------------------------------------------------------------------
Summary of changes:
lib/compression/lzxpress.c | 4 ++--
lib/nss_wrapper/nss_wrapper.c | 4 ++--
lib/popt/popt.h | 4 ++--
lib/replace/getpass.c | 2 +-
lib/replace/replace.c | 2 +-
lib/tdb/common/freelist.c | 2 +-
lib/tdb/common/tdb.c | 2 +-
lib/tevent/tevent.h | 2 +-
lib/tevent/tevent_liboop.c | 4 ++--
lib/tevent/tevent_req.c | 2 +-
lib/tsocket/tsocket.h | 28 ++++++++++++++--------------
lib/util/tests/parmlist.c | 6 +++---
lib/util/tests/strlist.c | 16 ++++++++--------
lib/util/util.c | 2 +-
lib/util/util.h | 8 ++++----
lib/util/util_strlist.c | 8 ++++----
lib/util/util_tdb.c | 4 ++--
lib/util/util_tdb.h | 4 ++--
lib/zlib/contrib/minizip/miniunz.c | 2 +-
lib/zlib/contrib/minizip/minizip.c | 4 ++--
lib/zlib/contrib/minizip/unzip.c | 8 ++++----
lib/zlib/contrib/minizip/unzip.h | 6 +++---
lib/zlib/contrib/minizip/zip.c | 6 +++---
lib/zlib/contrib/puff/puff.c | 2 +-
lib/zlib/deflate.h | 2 +-
lib/zlib/examples/fitblk.c | 2 +-
lib/zlib/examples/gun.c | 2 +-
lib/zlib/gzio.c | 4 ++--
lib/zlib/zlib.h | 2 +-
source4/auth/auth.h | 4 ++--
source4/auth/sam.c | 2 +-
source4/dynconfig/dynconfig.c | 2 +-
source4/kdc/kpasswdd.c | 2 +-
source4/kdc/wdc-samba4.c | 2 +-
source4/lib/ldb-samba/ldif_handlers.c | 2 +-
source4/lib/ldb/common/ldb_ldif.c | 2 +-
source4/lib/ldb/common/ldb_modules.c | 2 +-
source4/lib/ldb/common/ldb_msg.c | 2 +-
source4/lib/ldb/common/ldb_parse.c | 2 +-
source4/lib/ldb/include/ldb_errors.h | 2 +-
source4/lib/ldb/ldb_ildap/ldb_ildap.c | 2 +-
source4/lib/ldb/ldb_ldap/ldb_ldap.c | 2 +-
source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c | 2 +-
source4/lib/ldb/ldb_tdb/ldb_tdb.c | 2 +-
source4/lib/ldb/modules/paged_searches.c | 2 +-
source4/lib/registry/ldb.c | 2 +-
source4/lib/registry/patchfile.c | 8 ++++----
source4/lib/registry/tools/regshell.c | 2 +-
source4/lib/registry/tools/regtree.c | 4 ++--
source4/lib/tdb_wrap.h | 2 +-
source4/libnet/libnet_join.c | 2 +-
source4/nbt_server/wins/winsserver.c | 4 ++--
source4/param/tests/share.c | 2 +-
source4/smbd/process_single.c | 2 +-
source4/smbd/server.c | 2 +-
source4/smbd/service_named_pipe.c | 2 +-
source4/utils/ntlm_auth.c | 2 +-
source4/wrepl_server/wrepl_server.c | 2 +-
58 files changed, 107 insertions(+), 107 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/compression/lzxpress.c b/lib/compression/lzxpress.c
index 0abbfc4..26b1bd5 100644
--- a/lib/compression/lzxpress.c
+++ b/lib/compression/lzxpress.c
@@ -155,7 +155,7 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
compressed[nibble_index] |= (15 * 16);
}
- /* Additionnal best_len */
+ /* Additional best_len */
compressed[compressed_pos + metadata_size] = (best_len - (3 + 7 + 15)) & 0xFF;
metadata_size += sizeof(uint8_t);
} else {
@@ -167,7 +167,7 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
compressed[nibble_index] |= 15 << 4;
}
- /* Additionnal best_len */
+ /* Additional best_len */
compressed[compressed_pos + metadata_size] = 255;
metadata_size += sizeof(uint8_t);
diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index dc2d4f5..ebf61f2 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -207,7 +207,7 @@ struct nwrap_ops {
void (*nw_endgrent)(struct nwrap_backend *b);
};
-/* protoypes for files backend */
+/* prototypes for files backend */
static struct passwd *nwrap_files_getpwnam(struct nwrap_backend *b,
@@ -245,7 +245,7 @@ static int nwrap_files_getgrent_r(struct nwrap_backend *b,
size_t buflen, struct group **grdstp);
static void nwrap_files_endgrent(struct nwrap_backend *b);
-/* protoypes for module backend */
+/* prototypes for module backend */
static struct passwd *nwrap_module_getpwent(struct nwrap_backend *b);
static int nwrap_module_getpwent_r(struct nwrap_backend *b,
diff --git a/lib/popt/popt.h b/lib/popt/popt.h
index 7b94a98..c60ae29 100644
--- a/lib/popt/popt.h
+++ b/lib/popt/popt.h
@@ -458,7 +458,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
/** \ingroup popt
* Print detailed description of options.
* @param con context
- * @param fp ouput file handle
+ * @param fp output file handle
* @param flags (unused)
*/
void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
@@ -468,7 +468,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
/** \ingroup popt
* Print terse description of options.
* @param con context
- * @param fp ouput file handle
+ * @param fp output file handle
* @param flags (unused)
*/
void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
diff --git a/lib/replace/getpass.c b/lib/replace/getpass.c
index 0be618f..aab53c5 100644
--- a/lib/replace/getpass.c
+++ b/lib/replace/getpass.c
@@ -214,7 +214,7 @@ char *rep_getpass(const char *prompt)
catch_signal(SIGINT, SIGNAL_CAST SIG_DFL);
if (gotintr) {
- printf("Interupted by signal.\n");
+ printf("Interrupted by signal.\n");
fflush(stdout);
exit(1);
}
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 6f0851d..8eba98a 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -409,7 +409,7 @@ int rep_chroot(const char *dname)
int rep_mkstemp(char *template)
{
/* have a reasonable go at emulating it. Hope that
- the system mktemp() isn't completly hopeless */
+ the system mktemp() isn't completely hopeless */
char *p = mktemp(template);
if (!p)
return -1;
diff --git a/lib/tdb/common/freelist.c b/lib/tdb/common/freelist.c
index 8113b54..c7d908e 100644
--- a/lib/tdb/common/freelist.c
+++ b/lib/tdb/common/freelist.c
@@ -98,7 +98,7 @@ static int update_tailer(struct tdb_context *tdb, tdb_off_t offset,
}
/* Add an element into the freelist. Merge adjacent records if
- neccessary. */
+ necessary. */
int tdb_free(struct tdb_context *tdb, tdb_off_t offset, struct tdb_record *rec)
{
/* Allocation and tailer lock */
diff --git a/lib/tdb/common/tdb.c b/lib/tdb/common/tdb.c
index d2688de..f6ae3fd 100644
--- a/lib/tdb/common/tdb.c
+++ b/lib/tdb/common/tdb.c
@@ -212,7 +212,7 @@ TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
* function. The parsing function is executed under the chain read lock, so it
* should be fast and should not block on other syscalls.
*
- * DONT CALL OTHER TDB CALLS FROM THE PARSER, THIS MIGHT LEAD TO SEGFAULTS.
+ * DON'T CALL OTHER TDB CALLS FROM THE PARSER, THIS MIGHT LEAD TO SEGFAULTS.
*
* For mmapped tdb's that do not have a transaction open it points the parsing
* function directly at the mmap area, it avoids the malloc/memcpy in this
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index d355605..e318a4b 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -183,7 +183,7 @@ enum tevent_req_state {
*/
TEVENT_REQ_DONE,
/**
- * A user error has occured
+ * A user error has occurred
*/
TEVENT_REQ_USER_ERROR,
/**
diff --git a/lib/tevent/tevent_liboop.c b/lib/tevent/tevent_liboop.c
index c8503e7..3d36b0e 100644
--- a/lib/tevent/tevent_liboop.c
+++ b/lib/tevent/tevent_liboop.c
@@ -31,8 +31,8 @@
/*
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- NOTE: this code compiles fine, but is completly *UNTESTED*
- and is only commited as example
+ NOTE: this code compiles fine, but is completely *UNTESTED*
+ and is only committed as an example
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/
diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
index 345a2fd..f61ef53 100644
--- a/lib/tevent/tevent_req.c
+++ b/lib/tevent/tevent_req.c
@@ -417,7 +417,7 @@ void tevent_req_set_cancel_fn(struct tevent_req *req, tevent_req_cancel_fn fn)
/**
* @brief This function tries to cancel the given request
* @param[in] req The given request
- * @param[in] location Automaticly filled with the __location__ macro
+ * @param[in] location Automatically filled with the __location__ macro
* via the tevent_req_cancel() macro. This is for debugging
* only!
* @retval This function returns true is the request is cancelable.
diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index 84dc668..1cd40e4 100644
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -41,8 +41,8 @@ struct iovec;
/**
* @defgroup tsocket The tsocket API
*
- * The tsocket abstraction is splitted into two different kinds of
- * communitation interfaces.
+ * The tsocket abstraction is split into two different kinds of
+ * communication interfaces.
*
* There's the "tstream_context" interface with abstracts the communication
* through a bidirectional byte stream between two endpoints.
@@ -60,7 +60,7 @@ struct iovec;
* @section vsock Virtual Sockets
*
* The abstracted layout of tdgram_context and tstream_context allow
- * implementations arround virtual sockets for encrypted tunnels (like TLS,
+ * implementations around virtual sockets for encrypted tunnels (like TLS,
* SASL or GSSAPI) or named pipes over smb.
*
* @section npa Named Pipe Auth (NPA) Sockets
@@ -184,7 +184,7 @@ struct tevent_req *tdgram_recvfrom_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tdgram_recvfrom_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @param[in] mem_ctx The memory context to use.
*
@@ -253,7 +253,7 @@ struct tevent_req *tdgram_sendto_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tdgram_sendto_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @return The length of the datagram (0 is never returned!), -1 on
* error with perrno set to the actual errno.
@@ -298,7 +298,7 @@ struct tevent_req *tdgram_disconnect_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tdgram_disconnect_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @return The length of the datagram (0 is never returned!), -1 on
* error with perrno set to the actual errno.
@@ -379,7 +379,7 @@ struct tevent_req *tstream_readv_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tstream_readv_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @return The length of the stream (0 is never returned!), -1 on
* error with perrno set to the actual errno.
@@ -423,7 +423,7 @@ struct tevent_req *tstream_writev_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tstream_writev_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @return The length of the stream (0 is never returned!), -1 on
* error with perrno set to the actual errno.
@@ -463,7 +463,7 @@ struct tevent_req *tstream_disconnect_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tstream_disconnect_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @return The length of the stream (0 is never returned!), -1 on
* error with perrno set to the actual errno.
@@ -691,7 +691,7 @@ struct tevent_req *tstream_inet_tcp_connect_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tstream_inet_tcp_connect_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @param[in] mem_ctx The talloc memory context to use.
*
@@ -750,7 +750,7 @@ struct tevent_req * tstream_unix_connect_send(TALLOC_CTX *mem_ctx,
*
* @param[in] req The tevent request from tstream_inet_tcp_connect_send().
*
- * @param[out] perrno The error number, set if an error occured.
+ * @param[out] perrno The error number, set if an error occurred.
*
* @param[in] mem_ctx The talloc memory context to use.
*
@@ -921,7 +921,7 @@ int _tstream_bsd_existing_socket(TALLOC_CTX *mem_ctx,
* delivered to the underlying system socket.
*
* The caller needs to make sure that all non-scalar input parameters hang
- * arround for the whole lifetime of the request.
+ * around for the whole lifetime of the request.
*
* @param[in] mem_ctx The memory context for the result.
*
@@ -981,7 +981,7 @@ int tstream_readv_pdu_recv(struct tevent_req *req, int *perrno);
* callback is triggered when a full PDU has been read from the socket.
*
* The caller needs to make sure that all non-scalar input parameters hang
- * arround for the whole lifetime of the request.
+ * around for the whole lifetime of the request.
*
* @param[in] mem_ctx The memory context for the result
*
@@ -1026,7 +1026,7 @@ int tstream_readv_pdu_queue_recv(struct tevent_req *req, int *perrno);
* vectror has been delivered to the underlying system socket.
*
* The caller needs to make sure that all non-scalar input parameters hang
- * arround for the whole lifetime of the request.
+ * around for the whole lifetime of the request.
*
* @param[in] mem_ctx The memory context for the result.
*
diff --git a/lib/util/tests/parmlist.c b/lib/util/tests/parmlist.c
index 4b1d875..c1bd69d 100644
--- a/lib/util/tests/parmlist.c
+++ b/lib/util/tests/parmlist.c
@@ -59,8 +59,8 @@ static bool test_get(struct torture_context *tctx)
torture_assert_str_equal(tctx, e->key, "bar", "key");
torture_assert_str_equal(tctx, e->value, "mystring", "value");
- e = parmlist_get(pctx, "nonexistant");
- torture_assert(tctx, e == NULL, "nonexistant");
+ e = parmlist_get(pctx, "non-existent");
+ torture_assert(tctx, e == NULL, "non-existent");
return true;
}
@@ -87,7 +87,7 @@ static bool test_get_string_list(struct torture_context *tctx)
torture_assert_int_equal(tctx, str_list_length(ret), 2, "length");
torture_assert_str_equal(tctx, "true", ret[0], "ret[0]");
torture_assert_str_equal(tctx, "false", ret[1], "ret[1]");
- torture_assert(tctx, NULL == parmlist_get_string_list(pctx, "nonexistant", NULL), "nonexistant");
+ torture_assert(tctx, NULL == parmlist_get_string_list(pctx, "non-existent", NULL), "non-existent");
return true;
}
diff --git a/lib/util/tests/strlist.c b/lib/util/tests/strlist.c
index 8940dab..bf56243 100644
--- a/lib/util/tests/strlist.c
+++ b/lib/util/tests/strlist.c
@@ -26,7 +26,7 @@
struct test_list_element {
const char *list_as_string;
- const char *seperators;
+ const char *separators;
const char *list[5];
};
@@ -46,7 +46,7 @@ const struct test_list_element test_lists_strings[] = {
{
.list_as_string = "foo bar",
.list = { "foo bar", NULL },
- .seperators = ";"
+ .separators = ";"
},
{
.list_as_string = "\"foo bar\"",
@@ -59,7 +59,7 @@ const struct test_list_element test_lists_strings[] = {
{
.list_as_string = "\"foo bar\",comma;semicolon",
.list = { "\"foo bar\",comma", "semicolon", NULL },
- .seperators = ";"
+ .separators = ";"
}
};
@@ -79,7 +79,7 @@ const struct test_list_element test_lists_shell_strings[] = {
{
.list_as_string = "foo bar",
.list = { "foo bar", NULL },
- .seperators = ";"
+ .separators = ";"
},
{
.list_as_string = "\"foo bar\"",
@@ -107,11 +107,11 @@ static bool test_lists_shell(struct torture_context *tctx, const void *data)
bool match = true;
TALLOC_CTX *mem_ctx = tctx;
- ret1 = str_list_make_shell(mem_ctx, element->list_as_string, element->seperators);
+ ret1 = str_list_make_shell(mem_ctx, element->list_as_string, element->separators);
torture_assert(tctx, ret1, "str_list_make_shell() must not return NULL");
- tmp = str_list_join_shell(mem_ctx, (const char **) ret1, element->seperators ? *element->seperators : ' ');
- ret2 = str_list_make_shell(mem_ctx, tmp, element->seperators);
+ tmp = str_list_join_shell(mem_ctx, (const char **) ret1, element->separators ? *element->separators : ' ');
+ ret2 = str_list_make_shell(mem_ctx, tmp, element->separators);
if ((ret1 == NULL || ret2 == NULL) && ret2 != ret1) {
match = false;
@@ -144,7 +144,7 @@ static bool test_list_make(struct torture_context *tctx, const void *data)
const struct test_list_element *element = data;
char **result;
- result = str_list_make(tctx, element->list_as_string, element->seperators);
+ result = str_list_make(tctx, element->list_as_string, element->separators);
torture_assert(tctx, result, "str_list_make() must not return NULL");
torture_assert(tctx, str_list_equal((const char * const *) result,
element->list),
diff --git a/lib/util/util.c b/lib/util/util.c
index 25e0108..0064cef 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -351,7 +351,7 @@ _PUBLIC_ void dump_data(int level, const uint8_t *buf, int len)
* Write dump of binary data to the log file.
*
* The data is only written if the log level is at least level.
- * 16 zero bytes in a row are ommited
+ * 16 zero bytes in a row are omitted
*/
_PUBLIC_ void dump_data_skip_zeros(int level, const uint8_t *buf, int len)
{
diff --git a/lib/util/util.h b/lib/util/util.h
index 795bd9b..01831fc 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -450,7 +450,7 @@ _PUBLIC_ char **str_list_make(TALLOC_CTX *mem_ctx, const char *string,
/**
* build a null terminated list of strings from an argv-like input string
- * Entries are seperated by spaces and can be enclosed by quotes.
+ * Entries are separated by spaces and can be enclosed by quotes.
* Does NOT support escaping
*/
_PUBLIC_ char **str_list_make_shell(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
@@ -458,10 +458,10 @@ _PUBLIC_ char **str_list_make_shell(TALLOC_CTX *mem_ctx, const char *string, con
/**
* join a list back to one string
*/
-_PUBLIC_ char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char seperator);
+_PUBLIC_ char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char separator);
/** join a list back to one (shell-like) string; entries
- * seperated by spaces, using quotes where necessary */
+ * separated by spaces, using quotes where necessary */
_PUBLIC_ char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char sep);
/**
@@ -706,7 +706,7 @@ _PUBLIC_ void dump_data(int level, const uint8_t *buf,int len);
* Write dump of binary data to the log file.
*
* The data is only written if the log level is at least level.
- * 16 zero bytes in a row are ommited
+ * 16 zero bytes in a row are omitted
*/
_PUBLIC_ void dump_data_skip_zeros(int level, const uint8_t *buf, int len);
diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
index af733d1..953862d 100644
--- a/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
@@ -121,7 +121,7 @@ _PUBLIC_ char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const cha
/**
* build a null terminated list of strings from an argv-like input string
- * Entries are seperated by spaces and can be enclosed by quotes.
+ * Entries are separated by spaces and can be enclosed by quotes.
* Does NOT support escaping
*/
_PUBLIC_ char **str_list_make_shell(TALLOC_CTX *mem_ctx, const char *string, const char *sep)
@@ -183,7 +183,7 @@ _PUBLIC_ char **str_list_make_shell(TALLOC_CTX *mem_ctx, const char *string, con
/**
* join a list back to one string
*/
-_PUBLIC_ char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char seperator)
+_PUBLIC_ char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char separator)
{
char *ret = NULL;
int i;
@@ -194,14 +194,14 @@ _PUBLIC_ char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char sepera
ret = talloc_strdup(mem_ctx, list[0]);
for (i = 1; list[i]; i++) {
- ret = talloc_asprintf_append_buffer(ret, "%c%s", seperator, list[i]);
+ ret = talloc_asprintf_append_buffer(ret, "%c%s", separator, list[i]);
}
return ret;
}
/** join a list back to one (shell-like) string; entries
- * seperated by spaces, using quotes where necessary */
+ * separated by spaces, using quotes where necessary */
_PUBLIC_ char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char sep)
{
char *ret = NULL;
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index 46dbf6d..8973b9b 100644
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -133,7 +133,7 @@ int32_t tdb_fetch_int32(struct tdb_context *tdb, const char *keystr)
}
/****************************************************************************
- Store a int32_t value by an arbitary blob key, return 0 on success, -1 on failure.
+ Store a int32_t value by an arbitrary blob key, return 0 on success, -1 on failure.
Input is int32_t in native byte order. Output in tdb is in little-endian.
****************************************************************************/
@@ -190,7 +190,7 @@ bool tdb_fetch_uint32(struct tdb_context *tdb, const char *keystr, uint32_t *val
}
/****************************************************************************
- Store a uint32_t value by an arbitary blob key, return 0 on success, -1 on failure.
+ Store a uint32_t value by an arbitrary blob key, return 0 on success, -1 on failure.
Input is uint32_t in native byte order. Output in tdb is in little-endian.
****************************************************************************/
diff --git a/lib/util/util_tdb.h b/lib/util/util_tdb.h
index 79c4671..d2f6648 100644
--- a/lib/util/util_tdb.h
+++ b/lib/util/util_tdb.h
@@ -43,7 +43,7 @@ int32_t tdb_fetch_int32_byblob(struct tdb_context *tdb, TDB_DATA key);
int32_t tdb_fetch_int32(struct tdb_context *tdb, const char *keystr);
/****************************************************************************
- Store a int32_t value by an arbitary blob key, return 0 on success, -1 on failure.
+ Store a int32_t value by an arbitrary blob key, return 0 on success, -1 on failure.
Input is int32_t in native byte order. Output in tdb is in little-endian.
****************************************************************************/
int tdb_store_int32_byblob(struct tdb_context *tdb, TDB_DATA key, int32_t v);
@@ -67,7 +67,7 @@ bool tdb_fetch_uint32_byblob(struct tdb_context *tdb, TDB_DATA key, uint32_t *va
bool tdb_fetch_uint32(struct tdb_context *tdb, const char *keystr, uint32_t *value);
/****************************************************************************
- Store a uint32_t value by an arbitary blob key, return 0 on success, -1 on failure.
+ Store a uint32_t value by an arbitrary blob key, return 0 on success, -1 on failure.
Input is uint32_t in native byte order. Output in tdb is in little-endian.
****************************************************************************/
--
Samba Shared Repository
More information about the samba-cvs
mailing list