Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnatol Pomozov <anatol.pomozov@gmail.com>2013-04-14 19:33:46 -0700
committerAllan McRae <allan@archlinux.org>2013-04-18 13:20:13 +1000
commit769facca22db733f0a70ce6a38062d37fe8d2579 (patch)
treef344a3ec31338568237ca4eeff0a4025b52ee0f5 /src
parent597286eb258f841dfc00f65474138fc6192f0092 (diff)
Fix spelling errors using 'codespell' tool
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/conf.c4
-rw-r--r--src/pacman/pacman.c4
-rw-r--r--src/pacman/util.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 2ea49cc3..5adc96cf 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -519,7 +519,7 @@ static int _parse_options(const char *key, char *value,
char *endptr;
const char *oldlocale;
- /* set the locale to 'C' for consistant decimal parsing (0.7 and never
+ /* set the locale to 'C' for consistent decimal parsing (0.7 and never
* 0,7) from config files, then restore old setting when we are done */
oldlocale = setlocale(LC_NUMERIC, NULL);
setlocale(LC_NUMERIC, "C");
@@ -636,7 +636,7 @@ static int _add_mirror(alpm_db_t *db, char *value)
}
/** Sets up libalpm global stuff in one go. Called after the command line
- * and inital config file parsing. Once this is complete, we can see if any
+ * and initial config file parsing. Once this is complete, we can see if any
* paths were defined. If a rootdir was defined and nothing else, we want all
* of our paths to live under the rootdir that was specified. Safe to call
* multiple times (will only do anything the first time).
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 82f117bc..921331c6 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -287,7 +287,7 @@ static ssize_t xwrite(int fd, const void *buf, size_t count)
}
/** Catches thrown signals. Performs necessary cleanup to ensure database is
- * in a consistant state.
+ * in a consistent state.
* @param signum the thrown signal
*/
static void handler(int signum)
@@ -312,7 +312,7 @@ static void handler(int signum)
return;
}
}
- /* SIGINT: no commiting transaction, release it now and then exit pacman
+ /* SIGINT: no committing transaction, release it now and then exit pacman
* SIGHUP, SIGTERM: release no matter what */
alpm_trans_release(config->handle);
/* output a newline to be sure we clear any line we may be on */
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 643b6fea..35359678 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -314,7 +314,7 @@ size_t strtrim(char *str)
return end - pch;
}
-/* Replace all occurances of 'needle' with 'replace' in 'str', returning
+/* Replace all occurrences of 'needle' with 'replace' in 'str', returning
* a new string (must be free'd) */
char *strreplace(const char *str, const char *needle, const char *replace)
{
@@ -336,11 +336,11 @@ char *strreplace(const char *str, const char *needle, const char *replace)
q = strstr(p, needle);
}
- /* no occurences of needle found */
+ /* no occurrences of needle found */
if(!list) {
return strdup(str);
}
- /* size of new string = size of old string + "number of occurences of needle"
+ /* size of new string = size of old string + "number of occurrences of needle"
* x "size difference between replace and needle" */
newsz = strlen(str) + 1 +
alpm_list_count(list) * (replacesz - needlesz);
@@ -354,7 +354,7 @@ char *strreplace(const char *str, const char *needle, const char *replace)
for(i = list; i; i = alpm_list_next(i)) {
q = i->data;
if(q > p) {
- /* add chars between this occurence and last occurence, if any */
+ /* add chars between this occurrence and last occurrence, if any */
memcpy(newp, p, (size_t)(q - p));
newp += q - p;
}