summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-09-27 05:29:43 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-09-27 05:29:43 +0000
commit5f662896aaa9a6fb77194252aa612c09935e1930 (patch)
treef9070eaeb998502427039998d217affad2bd8b7a
parentd95e86b8b938692ced7802fbfd5331d8cd48cd5e (diff)
downloadsamba-5f662896aaa9a6fb77194252aa612c09935e1930.tar.gz
samba-5f662896aaa9a6fb77194252aa612c09935e1930.tar.bz2
samba-5f662896aaa9a6fb77194252aa612c09935e1930.zip
Vance picked up a pile of typos etc at the CIFS confernce, and finally got them
off his laptop :-) Andrew Bartlett (This used to be commit df8f0338fae01e5edc176708c2b798c67c2e8c36)
-rw-r--r--source3/Doxyfile8
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/lib/util_str.c16
-rw-r--r--source3/param/loadparm.c4
4 files changed, 15 insertions, 15 deletions
diff --git a/source3/Doxyfile b/source3/Doxyfile
index fe71065c24..bbdc5da7e7 100644
--- a/source3/Doxyfile
+++ b/source3/Doxyfile
@@ -124,7 +124,7 @@ MAN_LINKS = NO
#---------------------------------------------------------------------------
GENERATE_XML = NO
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = NO
MACRO_EXPANSION = NO
@@ -136,14 +136,14 @@ PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
+# configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE =
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# configuration options related to the dot tool
#---------------------------------------------------------------------------
HAVE_DOT = YES
CLASS_GRAPH = YES
@@ -159,7 +159,7 @@ MAX_DOT_GRAPH_HEIGHT = 1024
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
+# configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
CGI_NAME = search.cgi
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f3d9b7ec09..bd09ee55c8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -70,7 +70,7 @@ SWATDIR = @swatdir@
# the directory where lock files go
LOCKDIR = @lockdir@
-# the directorty where pid files go
+# the directory where pid files go
PIDDIR = @piddir@
# man pages language(s)
man_langs = "@manlangs@"
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 19d92eec8f..75338de4d3 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -468,7 +468,7 @@ char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, si
for(i = 0; i < len; i++) {
int val = (src[i] & 0xff);
- if(isupper(val) || islower(val) || isdigit(val) || strchr_m(other_safe_chars, val))
+ if (isupper(val) || islower(val) || isdigit(val) || strchr_m(other_safe_chars, val))
dest[i] = src[i];
else
dest[i] = '_';
@@ -501,7 +501,7 @@ char *StrnCpy(char *dest,const char *src,size_t n)
like strncpy but copies up to the character marker. always null terminates.
returns a pointer to the character marker in the source string (src).
****************************************************************************/
-char *strncpyn(char *dest, const char *src,size_t n, char c)
+char *strncpyn(char *dest, const char *src, size_t n, char c)
{
char *p;
size_t str_len;
@@ -643,8 +643,8 @@ void string_free(char **s)
}
/****************************************************************************
-set a string value, allocing the space for the string, and deallocating any
-existing space
+set a string value, deallocating any existing space, and allocing the space
+for the string
****************************************************************************/
BOOL string_set(char **dest,const char *src)
{
@@ -724,7 +724,7 @@ void pstring_sub(char *s,const char *pattern,const char *insert)
/* similar to string_sub, but it will accept only allocated strings
* and may realloc them so pay attention at what you pass on no
- * pointers inside strings, no pstrings or const must be passed
+ * pointers inside strings, no pstrings or const may be passed
* as string.
*/
@@ -830,7 +830,7 @@ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len)
/****************************************************************************
similar to all_string_sub but for unicode strings.
-return a new allocate unicode string.
+return a new allocated unicode string.
similar to string_sub() but allows for any character to be substituted.
Use with caution!
****************************************************************************/
@@ -1203,7 +1203,7 @@ BOOL str_list_copy(char ***dest, char **src)
lsize += S_LIST_ABS;
rlist = (char **)Realloc(list, ((sizeof(char **)) * (lsize +1)));
if (!rlist) {
- DEBUG(0,("str_list_copy: Unable to allocate memory"));
+ DEBUG(0,("str_list_copy: Unable to re-allocate memory"));
str_list_free(&list);
return False;
}
@@ -1225,7 +1225,7 @@ BOOL str_list_copy(char ***dest, char **src)
return True;
}
-/* return true if all the elemnts of the list matches exactly */
+/* return true if all the elements of the list match exactly */
BOOL str_list_compare(char **list1, char **list2)
{
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index eb910a1245..67276befec 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -600,7 +600,7 @@ static struct enum_list enum_ldap_ssl[] = {
{LDAP_SSL_OFF, "off"},
{LDAP_SSL_OFF, "Off"},
{LDAP_SSL_START_TLS, "start tls"},
- {LDAP_SSL_START_TLS, "start_tls"},
+ {LDAP_SSL_START_TLS, "Start_tls"},
{-1, NULL}
};
@@ -1185,7 +1185,7 @@ static void init_printer_values(void)
"lp -i %p-%j -H hold");
string_set(&sDefault.szLpresumecommand,
"lp -i %p-%j -H resume");
-#endif /* SYSV */
+#endif /* HPUX */
break;
case PRINT_QNX: