summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/add.c2
-rw-r--r--lib/libalpm/be_package.c4
-rw-r--r--lib/libalpm/deps.c2
-rw-r--r--lib/libalpm/signing.c2
-rw-r--r--lib/libalpm/util.c6
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 1d9db602..3ef81e37 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -314,7 +314,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
hash_local = alpm_compute_md5sum(filename);
hash_pkg = alpm_compute_md5sum(checkfile);
- /* update the md5 hash in newpkg's backup (it will be the new orginal) */
+ /* update the md5 hash in newpkg's backup (it will be the new original) */
alpm_list_t *i;
for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) {
alpm_backup_t *backup = i->data;
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 3b43ed84..cfe5fb36 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -390,7 +390,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
/* If full is false, only read through the archive until we find our needed
* metadata. If it is true, read through the entire archive, which serves
- * as a verfication of integrity and allows us to create the filelist. */
+ * as a verification of integrity and allows us to create the filelist. */
while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
const char *entry_name = archive_entry_pathname(entry);
@@ -460,7 +460,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
}
}
- if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occured */
+ if(ret != ARCHIVE_EOF && ret != ARCHIVE_OK) { /* An error occurred */
_alpm_log(handle, ALPM_LOG_ERROR, _("error while reading package %s: %s\n"),
pkgfile, archive_error_string(archive));
handle->pm_errno = ALPM_ERR_LIBARCHIVE;
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index aebfd0b5..96c49a9f 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -488,7 +488,7 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep)
/* These parameters are messy. We check if this package, given a list of
* targets and a db is safe to remove. We do NOT remove it if it is in the
- * target list, or if if the package was explictly installed and
+ * target list, or if if the package was explicitly installed and
* include_explicit == 0 */
static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg,
alpm_list_t *targets, int include_explicit)
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index c653e454..32084585 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -105,7 +105,7 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum)
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old");
/* A policy was not met. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy");
- /* A system error occured. */
+ /* A system error occurred. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error");
/* Fallback case */
if(!sigsum) {
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index dc1d0435..f84fb666 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -527,7 +527,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[])
goto cleanup;
}
- /* fork- parent and child each have seperate code blocks below */
+ /* fork- parent and child each have separate code blocks below */
pid = fork();
if(pid == -1) {
_alpm_log(handle, ALPM_LOG_ERROR, _("could not fork a new process (%s)\n"), strerror(errno));
@@ -677,7 +677,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename)
return NULL;
}
-/** Check the alpm cachedirs for existance and find a writable one.
+/** Check the alpm cachedirs for existence and find a writable one.
* If no valid cache directory can be found, use /tmp.
* @param handle the context handle
* @return pointer to a writable cache directory.
@@ -1251,7 +1251,7 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a
/** Checks whether a string matches a shell wildcard pattern.
* Wrapper around fnmatch.
- * @param pattern pattern to match aganist
+ * @param pattern pattern to match against
* @param string string to check against pattern
* @return 0 if string matches pattern, non-zero if they don't match and on
* error