summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/add.c2
-rw-r--r--lib/libalpm/alpm.h14
-rw-r--r--lib/libalpm/be_package.c2
-rw-r--r--lib/libalpm/deps.c4
-rw-r--r--lib/libalpm/diskspace.c2
-rw-r--r--lib/libalpm/dload.c2
-rw-r--r--lib/libalpm/filelist.c2
-rw-r--r--lib/libalpm/handle.h8
-rw-r--r--lib/libalpm/remove.c4
-rw-r--r--lib/libalpm/signing.c24
-rw-r--r--lib/libalpm/trans.c2
-rw-r--r--lib/libalpm/util.c6
12 files changed, 36 insertions, 36 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index ee29a127..214e78ee 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -671,7 +671,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
break;
}
- /* run the post-install script if it exists */
+ /* run the post-install script if it exists */
if(alpm_pkg_has_scriptlet(newpkg)
&& !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
char *scriptlet = _alpm_local_db_pkgpath(db, newpkg, "install");
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 2c8c1e61..e9b0febd 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -79,17 +79,17 @@ typedef enum _alpm_pkgvalidation_t {
/** Types of version constraints in dependency specs. */
typedef enum _alpm_depmod_t {
- /** No version constraint */
+ /** No version constraint */
ALPM_DEP_MOD_ANY = 1,
- /** Test version equality (package=x.y.z) */
+ /** Test version equality (package=x.y.z) */
ALPM_DEP_MOD_EQ,
- /** Test for at least a version (package>=x.y.z) */
+ /** Test for at least a version (package>=x.y.z) */
ALPM_DEP_MOD_GE,
- /** Test for at most a version (package<=x.y.z) */
+ /** Test for at most a version (package<=x.y.z) */
ALPM_DEP_MOD_LE,
- /** Test for greater than some version (package>x.y.z) */
+ /** Test for greater than some version (package>x.y.z) */
ALPM_DEP_MOD_GT,
- /** Test for less than some version (package<x.y.z) */
+ /** Test for less than some version (package<x.y.z) */
ALPM_DEP_MOD_LT
} alpm_depmod_t;
@@ -250,7 +250,7 @@ typedef struct _alpm_sigresult_t {
/**
* Signature list. Contains the number of signatures found and a pointer to an
- * array of results. The array is of size count.
+ * array of results. The array is of size count.
*/
typedef struct _alpm_siglist_t {
size_t count;
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 4e814f8b..aaf60fe8 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -423,7 +423,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
}
config = 1;
continue;
- } else if(strcmp(entry_name, ".INSTALL") == 0) {
+ } else if(strcmp(entry_name, ".INSTALL") == 0) {
newpkg->scriptlet = 1;
} else if(*entry_name == '.') {
/* for now, ignore all files starting with '.' that haven't
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index dd85a014..e5a04047 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -381,8 +381,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle,
/* 1. check upgrade list for satisfiers */
/* 2. check dblist for satisfiers */
if(causingpkg &&
- !find_dep_satisfier(upgrade, depend) &&
- !find_dep_satisfier(dblist, depend)) {
+ !find_dep_satisfier(upgrade, depend) &&
+ !find_dep_satisfier(dblist, depend)) {
alpm_depmissing_t *miss;
char *missdepstring = alpm_dep_compute_string(depend);
_alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n",
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index 4526e89e..dcab3b03 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -357,7 +357,7 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir,
size_t j;
int error = 0;
- /* resolve the cachedir path to ensure we check the right mountpoint. We
+ /* resolve the cachedir path to ensure we check the right mountpoint. We
* handle failures silently, and continue to use the possibly unresolved
* path. */
if(realpath(cachedir, resolved_cachedir) != NULL) {
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 866c51df..c74d2ad1 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -465,7 +465,7 @@ static int curl_download_internal(struct dload_payload *payload,
payload->curlerr);
/* disconnect relationships from the curl handle for things that might go out
- * of scope, but could still be touched on connection teardown. This really
+ * of scope, but could still be touched on connection teardown. This really
* only applies to FTP transfers. */
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL);
diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c
index f8db9a33..e6da681e 100644
--- a/lib/libalpm/filelist.c
+++ b/lib/libalpm/filelist.c
@@ -97,7 +97,7 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA,
} else {
/* TODO: this creates conflicts between a symlink to a directory in
* one package and a real directory in the other. For example,
- * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed
+ * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed
* when installing one package at a time _provided_ pkg1 is installed
* first. This will need adjusted if the order of package install can
* be guaranteed to install the symlink first */
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index a4e2cf72..4126e1ac 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -52,7 +52,7 @@ do { \
struct __alpm_handle_t {
/* internal usage */
- alpm_db_t *db_local; /* local db pointer */
+ alpm_db_t *db_local; /* local db pointer */
alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */
FILE *logstream; /* log file stream pointer */
int lockfd; /* lock file descriptor */
@@ -64,10 +64,10 @@ struct __alpm_handle_t {
#endif
/* callback functions */
- alpm_cb_log logcb; /* Log callback function */
- alpm_cb_download dlcb; /* Download callback function */
+ alpm_cb_log logcb; /* Log callback function */
+ alpm_cb_download dlcb; /* Download callback function */
alpm_cb_totaldl totaldlcb; /* Total download callback function */
- alpm_cb_fetch fetchcb; /* Download file callback function */
+ alpm_cb_fetch fetchcb; /* Download file callback function */
alpm_cb_event eventcb;
alpm_cb_question questioncb;
alpm_cb_progress progresscb;
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index e745d89f..9417a61e 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -672,7 +672,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
_alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n",
pkgname, pkgver);
- /* run the pre-remove scriptlet if it exists */
+ /* run the pre-remove scriptlet if it exists */
if(alpm_pkg_has_scriptlet(oldpkg) &&
!(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
char *scriptlet = _alpm_local_db_pkgpath(handle->db_local,
@@ -692,7 +692,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
oldpkg->name, oldpkg->version);
}
- /* run the post-remove script if it exists */
+ /* run the post-remove script if it exists */
if(!newpkg && alpm_pkg_has_scriptlet(oldpkg) &&
!(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
char *scriptlet = _alpm_local_db_pkgpath(handle->db_local,
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 7e4d41bc..b594a9be 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -85,27 +85,27 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum)
/* The docs say this can be a bitmask...not sure I believe it, but we'll code
* for it anyway and show all possible flags in the returned string. */
- /* The signature is fully valid. */
+ /* The signature is fully valid. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_VALID, "valid");
- /* The signature is good. */
+ /* The signature is good. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_GREEN, "green");
- /* The signature is bad. */
+ /* The signature is bad. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_RED, "red");
- /* One key has been revoked. */
+ /* One key has been revoked. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked");
- /* One key has expired. */
+ /* One key has expired. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired");
- /* The signature has expired. */
+ /* The signature has expired. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired");
- /* Can't verify: key missing. */
+ /* Can't verify: key missing. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_MISSING, "key missing");
- /* CRL not available. */
+ /* CRL not available. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_MISSING, "crl missing");
- /* Available CRL is too old. */
+ /* Available CRL is too old. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old");
- /* A policy was not met. */
+ /* A policy was not met. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy");
- /* A system error occurred. */
+ /* A system error occurred. */
sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error");
/* Fallback case */
if(!sigsum) {
@@ -679,7 +679,7 @@ error:
return ret;
}
-#else /* HAVE_LIBGPGME */
+#else /* HAVE_LIBGPGME */
int _alpm_key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr)
{
return -1;
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 8d4e0e73..a795a1fa 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -289,7 +289,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
if(!is_archive && !grep(filepath, script)) {
/* script not found in scriptlet file; we can only short-circuit this early
- * if it is an actual scriptlet file and not an archive. */
+ * if it is an actual scriptlet file and not an archive. */
return 0;
}
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 19a8612f..f9fdb018 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -142,7 +142,7 @@ done:
/** Copies a file.
* @param src file path to copy from
* @param dest file path to copy to
- * @return 0 on success, 1 on error
+ * @return 0 on success, 1 on error
*/
int _alpm_copyfile(const char *src, const char *dest)
{
@@ -920,7 +920,7 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename)
return hex_representation(output, 32);
}
-/** Calculates a file's MD5 or SHA2 digest and compares it to an expected value.
+/** Calculates a file's MD5 or SHA-2 digest and compares it to an expected value.
* @param filepath path of the file to check
* @param expected hash value to compare against
* @param type digest type to use
@@ -958,7 +958,7 @@ int _alpm_test_checksum(const char *filepath, const char *expected,
* Does not handle sparse files on purpose for speed.
* @param a
* @param b
- * @return
+ * @return
*/
int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b)
{
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-15 19:00:54 +0000