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

issue #2228: refine config directive token parse; #4042

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

suzp1984
Copy link
Contributor

make sure one directive token don't span more than two lines.

try to fix #2228

@winlinvip winlinvip added the EnglishNative This issue is conveyed exclusively in English. label Apr 24, 2024
@suzp1984 suzp1984 force-pushed the issue/2228-config-parse-end-of-line branch 3 times, most recently from 349f5cd to f74a308 Compare April 24, 2024 08:07
@@ -0,0 +1,37 @@
#!/bin/bash

TRUNK_DIR=$(dirname -- "${BASH_SOURCE[0]}")/../
Copy link
Member

Choose a reason for hiding this comment

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

Test file? Should remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, the var store the path of trunk folder, the almost the source root of srs project, then doing the next steps.
run srs -t -c [conf file] for every file inside ${TRUNK_DIR}/conf/*.

@@ -223,7 +223,7 @@ VOID TEST(SampleTest, ContextTest)
cache[0] = cid;
}

MockProtectedBuffer::MockProtectedBuffer() : size_(0), data_(NULL), raw_memory_(NULL)
MockProtectedBuffer::MockProtectedBuffer() : raw_memory_(NULL), size_(0), data_(NULL)
Copy link
Member

Choose a reason for hiding this comment

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

Nothing changed?

Copy link
Contributor Author

@suzp1984 suzp1984 Apr 24, 2024

Choose a reason for hiding this comment

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

Yes, just to fix a compiler warning: the init order should be the declare orders in the header file.

private:
char* raw_memory_;
public:
int size_;
// Should use this as data.
char* data_;

@suzp1984 suzp1984 force-pushed the issue/2228-config-parse-end-of-line branch 3 times, most recently from 39152ce to 8b95506 Compare April 24, 2024 10:39
make sure one directive token don't span more than two lines.
@suzp1984 suzp1984 force-pushed the issue/2228-config-parse-end-of-line branch from 8b95506 to 99b0f64 Compare April 24, 2024 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EnglishNative This issue is conveyed exclusively in English.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Config: Failed to parse config ending with newline.
2 participants