Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos found by codespell #775

Closed

Conversation

DimitriPapadopoulos
Copy link
Contributor

No description provided.

@fredgan fredgan mentioned this pull request Feb 6, 2023
@spaette
Copy link

spaette commented Feb 16, 2023

https://github.com/madler/zlib/pull/673#issuecomment-1224913167

@DimitriPapadopoulos
Copy link
Contributor Author

I thought so, that's why I have two commits – one outside config and one inside config. Do you want me to discard the one inside config? But then these are just typo fixes.

@DimitriPapadopoulos
Copy link
Contributor Author

@spaette Fixed, see also #782, #783, #784.

@spaette
Copy link

spaette commented Feb 17, 2023

it's unknown whether approved changes would be implemented in a local branch or directly into the master branch


@anisimkov is unlikely to respond to your ping

the relevant Issue PR which had a linked to comment above had these lines

sed -i "s/Attension/Attention/g" zlib/contrib/ada/readme.txt
sed -i "s/Comression/Compression/g" zlib/contrib/ada/zlib-streams.ads
sed -i "s/stategy/strategy/g" zlib/contrib/ada/zlib.ads

and also these

sed -i "s/compearing/comparing/g" zlib/contrib/ada/test.adb
sed -i "s/incompartible/incompatible/g" zlib/contrib/ada/readme.txt
sed -i "s/spetsified/specified/g" zlib/contrib/ada/test.adb

you further suggest a change as follows

        --  We allow ZLib to make header only in case of default header type.
-       --  Otherwise we would either do header by ourselfs, or do not do
+       --  Otherwise we would either do header by ourselves, or do not do
        --  header at all.

@hravnx approved these changes to dotzlib

sed -i "s/implmeneted/implemented/g" zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
sed -i "s/suppported/supported/g" zlib/contrib/dotzlib/DotZLib/GZipStream.cs

the relevant Issue PR which had a linked to comment above also has these lines

sed -i "s/dereived/derived/g" zlib/contrib/dotzlib/DotZLib/CodecBase.cs
sed -i "s/esclude/exclude/g" zlib/contrib/dotzlib/readme.txt
sed -i "s/proccesing/processing/g" zlib/contrib/dotzlib/DotZLib/CodecBase.cs

@gvollant last year had submitted pulls to this repo

the relevant Issue PR which had a linked to comment above had these lines

# sed -i "s/derrived/derived/g" zlib/contrib/minizip/MiniZip64_Changes.txt
sed -i "s/choosen/chosen/g" zlib/contrib/minizip/ioapi.h
sed -i "s/comparision/comparison/g" zlib/contrib/minizip/unzip.h
sed -i "s/currenty/currently/g" zlib/contrib/minizip/zip.c
sed -i "s/defaut/default/g" zlib/contrib/minizip/unzip.c
sed -i "s/defaut/default/g" zlib/contrib/minizip/unzip.h
sed -i "s/depedent/dependent/g" zlib/contrib/minizip/zip.c
sed -i "s/easilty/easily/g" zlib/contrib/minizip/unzip.c
sed -i "s/extened/extended/g" zlib/contrib/minizip/zip.c
sed -i "s/recreting/recreating/g" zlib/contrib/minizip/zip.c
sed -i "s/somes/some/g" zlib/contrib/minizip/unzip.h
sed -i "s/structore/structure/g" zlib/contrib/minizip/unzip.c
sed -i "s/structore/structure/g" zlib/contrib/minizip/zip.c

the your pull includes some additional exposed typos

$ ed -s zlib/contrib/minizip/unzip.c <<<'56,57p'
  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
$ ed -s zlib/contrib/minizip/unzip.c <<<'383,384p'
   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
$ ed -s zlib/contrib/minizip/unzip.c <<<'593,596p'
    uLong number_disk;          /* number of the current dist, used for
                                   spaning ZIP, unsupported, always 0*/
    uLong number_disk_with_CD;  /* number the the disk with central dir, used
                                   for spaning ZIP, unsupported, always 0*/
$ ed -s zlib/contrib/minizip/unzip.c <<<'1681,1683p'
  return the number of byte copied if somes bytes are copied
  return 0 if the end of file was reached
  return <0 with error code if there is an error
$ ed -s zlib/contrib/minizip/zip.c <<<'650,653p'
  uLong number_disk;          /* number of the current dist, used for
                              spaning ZIP, unsupported, always 0*/
  uLong number_disk_with_CD;  /* number the the disk with central dir, used
                              for spaning ZIP, unsupported, always 0*/
$ ed -s zlib/contrib/minizip/zip.h <<<'132,135p'
/* Note : there is no delete function into a zipfile.
   If you want delete file into a zipfile, you must open a zipfile, and create another
   Of couse, you can use RAW reading and writing to copy the file you did not want delte
*/
$ grep -n crypted zlib/contrib/minizip/miniunz.c
205:           "  -p  extract crypted file using password\n\n");
264:        /* display a '*' if the file is crypted */
$ grep -nr doesnt zlib
zlib/contrib/minizip/minizip.c:117:    /* strncpy doesnt append the trailing NULL, of the string is too long. */
zlib/contrib/minizip/minizip.c:326:        /* strncpy doesnt append the trailing NULL, of the string is too long. */
zlib/contrib/minizip/miniunz.c:609:        /* strncpy doesnt append the trailing NULL, of the string is too long. */
$ 

@spaette
Copy link

spaette commented Feb 17, 2023

before pursuing any more work on the now ada and minizip separate pulls my suggestion would be to first receive confirmation that the relevant contributors want to spend the time to review updates to their own contributions in terms of typo fixes

as pertains to ada that response is unlikely to arrive

@DimitriPapadopoulos
Copy link
Contributor Author

If the initial contributors do not want to spend the time to maintain their code, will it remain as it is forever? What is the rationale behind this decision? It seems at odds with the whole point of open source.

DimitriPapadopoulos added a commit to DimitriPapadopoulos/codespell that referenced this pull request Feb 18, 2023
@DimitriPapadopoulos
Copy link
Contributor Author

In any case, I understand ada and minizip are not a priority.

I haven't found yet the "relevant PR" you refer to, but I have added the missing typos to the codespell dictionary of typos: codespell-project/codespell#2742

What about changes to zlib itself (this merge request)?

DimitriPapadopoulos added a commit to DimitriPapadopoulos/codespell that referenced this pull request Feb 18, 2023
DimitriPapadopoulos added a commit to DimitriPapadopoulos/codespell that referenced this pull request Feb 18, 2023
DimitriPapadopoulos added a commit to DimitriPapadopoulos/codespell that referenced this pull request Feb 18, 2023
@DimitriPapadopoulos
Copy link
Contributor Author

DimitriPapadopoulos commented Feb 18, 2023

it's unknown whether approved changes would be implemented in a local branch or directly into the master branch

But then how to create pull requests? Pull requests are usually created against the main/master branch. How do I know which branch to create the pull request against?

DimitriPapadopoulos added a commit to codespell-project/codespell that referenced this pull request Feb 18, 2023
@spaette
Copy link

spaette commented Feb 18, 2023

Sometimes there are intentions to schedule changes concomitant with an upcoming new release.

Occasionally code or bundled code as it were may become described as abandonware or orphanware.

this merge request

I'm neither designated as a Reviewer nor have I write authority for this repo.


AFAIK, pertaining to contrib subdirectories it is not a matter of priorities.

the relevant Issue PR which had a linked to comment above

#775 (comment)

it's unknown whether approved changes would
be implemented in a local branch or directly into
the master branch

The master branch in this repo is the correct branch to create the pull request against.

Maintainers have their own individual or collective approach to changes in the source code.

@DimitriPapadopoulos
Copy link
Contributor Author

I see, nothing's certain.

@spaette
Copy link

spaette commented Feb 18, 2023

many typo fixes proposed on 7-5-2022 were incorporated on 8-23-2022

@spaette
Copy link

spaette commented Feb 19, 2023

cf: #784 (Open)

contrib/minizip/unzip.c
contrib/minizip/unzip.h

this isn't a request but as long at you've submitted a minizip bulk typo fix see also my comment on #592

noting @sredna in that same PR submitted a layout change for a code comment in contrib/minizip/unzip.c

@gvollant
Copy link
Contributor

are somes change linked with #784 ?

@DimitriPapadopoulos
Copy link
Contributor Author

DimitriPapadopoulos commented Jul 29, 2023

@gvollant It had been suggested I open different merge requests for some subdirectories maintained by their respective contributors:

This merge request #775 fixes typos outside these subdirectories.

@spaette
Copy link

spaette commented Jul 29, 2023

This merge request #775 fixes typos outside these subdirectories.

specifically the typos
endianness, formerly, latest, recompression, update

respectively in
crc32.c, README, FAQ, examples/fitblk.c, and configure

if this pull is merged then close #768


@hravnx reviewed #783 on Feb 17

presumably he has no objections to the fixes added on Feb 18

@gvollant gave a green light on #784 merge

@Neustradamus
Copy link

@madler: Have you seen? Can you merge it?

@madler madler changed the base branch from master to develop August 3, 2023 20:12
@madler
Copy link
Owner

madler commented Aug 3, 2023

Applied.

@madler madler closed this Aug 3, 2023
@DimitriPapadopoulos DimitriPapadopoulos deleted the codespell branch August 4, 2023 10:45
@spaette
Copy link

spaette commented Aug 4, 2023

cf: #782

@anisimkov had not responded to the comment of @DimitriPapadopoulos

looks like the content of all of the pulls of @DimitriPapadopoulos have been committed to the develop branch

@Neustradamus
Copy link

Merged commit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants