Hi
On Sun, Apr 14, 2013 at 7:56 PM, Connor Behan <[email protected]>wrote: > On 14/04/13 07:33 PM, Anatol Pomozov wrote: > > --- > > NEWS | 2 +- > > lib/libalpm/add.c | 2 +- > > lib/libalpm/be_package.c | 4 ++-- > > lib/libalpm/deps.c | 2 +- > > lib/libalpm/signing.c | 2 +- > > lib/libalpm/util.c | 6 +++--- > > m4/pkg.m4 | 2 +- > > scripts/library/README | 2 +- > > src/pacman/conf.c | 4 ++-- > > src/pacman/pacman.c | 4 ++-- > > src/pacman/util.c | 8 ++++---- > > test/scripts/parseopts_test.sh | 2 +- > > 12 files changed, 20 insertions(+), 20 deletions(-) > > > > diff --git a/NEWS b/NEWS > > index 3a0361d..ce52e6f 100644 > > --- a/NEWS > > +++ b/NEWS > > @@ -912,7 +912,7 @@ VERSION DESCRIPTION > > - HTTP/1.1 support > > - an improved progress bar with transfer rates and ETA > > - cleaned up warning output a bit > > -2.7.2 - Supressed "No such file" messages during stripping > > +2.7.2 - Suppressed "No such file" messages during stripping > > - Removed extra newlines in /var/log/pacman.log > > - Added a --noextract option to makepkg to skip source > extraction > > 2.7.1 - Fixed a couple obscure segfaults > > diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c > > index 1d9db60..3ef81e3 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 3b43ed8..cfe5fb3 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 aebfd0b..96c49a9 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 c653e45..3208458 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 dc1d043..f84fb66 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 > > diff --git a/m4/pkg.m4 b/m4/pkg.m4 > > index 5152a4b..5c20244 100644 > > --- a/m4/pkg.m4 > > +++ b/m4/pkg.m4 > > @@ -53,7 +53,7 @@ fi[]dnl > > # to PKG_CHECK_MODULES(), but does not set variables or print errors. > > # > > # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) > > -# only at the first occurence in configure.ac, so if the first place > > +# only at the first occurrence in configure.ac, so if the first place > > # it's called might be skipped (such as if it is within an "if", you > > # have to call PKG_CHECK_EXISTS manually > > # -------------------------------------------------------------- > > diff --git a/scripts/library/README b/scripts/library/README > > index c28ebc6..9e2b6a1 100644 > > --- a/scripts/library/README > > +++ b/scripts/library/README > > @@ -17,7 +17,7 @@ the short opts, any number of valid long opts may be > be passed. The end > > of the options delimiter must then be added, followed by the user > arguments > > to the calling program. > > > > -Reccommended Usage: > > +Recommended Usage: > > OPT_SHORT='fb:z' > > OPT_LONG=('foo' 'bar:' 'baz') > > if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then > > diff --git a/src/pacman/conf.c b/src/pacman/conf.c > > index 2ea49cc..5adc96c 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 916873d..c220b27 100644 > > --- a/src/pacman/pacman.c > > +++ b/src/pacman/pacman.c > > @@ -288,7 +288,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) > > @@ -313,7 +313,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 862c8e8..bcaead0 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; > > } > > diff --git a/test/scripts/parseopts_test.sh > b/test/scripts/parseopts_test.sh > > index 1693b9f..2862cae 100755 > > --- a/test/scripts/parseopts_test.sh > > +++ b/test/scripts/parseopts_test.sh > > @@ -83,7 +83,7 @@ parse '-p PKGBUILD --' 3 -pPKGBUILD > > # valid shortopts as a long opt > > parse '--' 1 --sir > > > > -# long opt wiht no optarg > > +# long opt with no optarg > > parse '--log --' 2 --log > > > > # long opt with missing optarg > > There's an "if if" that codespell didn't catch. > Unfortunately codespell has limited dictionary of misspellings. "if if" can be fixed in the next commit, or even easier if commiter update this change and squash it into this change.
