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

Sync jparse/ from jparse repo #1029

Merged
merged 3 commits into from
Nov 17, 2024
Merged

Sync jparse/ from jparse repo #1029

merged 3 commits into from
Nov 17, 2024

Conversation

xexyl
Copy link
Contributor

@xexyl xexyl commented Nov 17, 2024

This adds a new utility function that will be used in required updates for chkentry(1) post IOCCC28 and updates the util test code (which tests the new function).

A minor change in the jstrencode.1 man page was also done though wording might be needing in fixing (that can come another time however as other changes might be required).

This adds a new utility function that will be used in required updates
for chkentry(1) post IOCCC28 and updates the util test code (which tests
the new function).

A minor change in the jstrencode.1 man page was also done though wording
might be needing in fixing (that can come another time however as other
changes might be required).
@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

Okay all good I think! Thanks for waiting for these useful changes. Back later in some form .. though that might only be the jparse repo issues.

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

make test worked on my end so let's hope that it works fine here too. If not I'll fix in a while.

jparse/json_util.c Fixed Show fixed Hide fixed
@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

Ah .. missed an arg. Let me fix real quick. Hope I have time. Otherwise in a while.

@lcn2
Copy link
Contributor

lcn2 commented Nov 17, 2024

Waiting for you to fix the "too few args" issue.

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

Hmm .. conflicting files how? And how do you enable that test btw? I tried to see but didn't seem to find it or be able to enable it.

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

Okay will have to fix in a bit. Sorry!

@lcn2
Copy link
Contributor

lcn2 commented Nov 17, 2024

Hmm .. conflicting files how? And how do you enable that test btw? I tried to see but didn't seem to find it or be able to enable it.

It is one of the security workflows. See .github/workflows/codeql.yml

@lcn2
Copy link
Contributor

lcn2 commented Nov 17, 2024

We will wait until you resolve the merge conflict. It is probably better if you do that on your end.

@lcn2
Copy link
Contributor

lcn2 commented Nov 17, 2024

We have to shower and pack up the hotel room for a checkout. Will come back in about an hour or so.

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

Hmm .. conflicting files how? And how do you enable that test btw? I tried to see but didn't seem to find it or be able to enable it.

It is one of the security workflows. See .github/workflows/codeql.yml

Could have sworn I had it .. will check in a while.

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

We will wait until you resolve the merge conflict. It is probably better if you do that on your end.

I will. Strange problem though .. I just copied the new file over and committed it yet it has the merge conflict ? I have to go afk now ..

Safe travels!

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

Hopefully this solves it now ...

Copy link
Contributor

@lcn2 lcn2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

All good!

@lcn2 lcn2 merged commit 3c144df into ioccc-src:master Nov 17, 2024
3 checks passed
@xexyl
Copy link
Contributor Author

xexyl commented Nov 17, 2024

I can't seem to get that extra check to work. Strange. I rolled back the changes. Maybe will look at it another time. Not many differences besides removed comments in the two files. Major difference is jparse has to run extra steps to get compilation to work: obviously for the external libraries.

@xexyl xexyl deleted the util branch November 17, 2024 17:14
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.

2 participants