Skip to content

Change ReadFile instances to app-specific naming. #6673

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.

Sign up for GitHub

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

Merged
JacobBarthelmeh merged 1 commit into from
Aug 4, 2023
Merged

Change ReadFile instances to app-specific naming. #6673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/asn1/asn1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static Asn1 asn1;
* @return 0 on success.
* @return 1 on failure.
*/
static int ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
static int asn1App_ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
{
int ret = 0;
word32 len = 0;
Expand Down Expand Up @@ -121,7 +121,7 @@ static int PrintDer(FILE* fp)
unsigned char* data = NULL;

/* Load DER/BER file. */
if (ReadFile(fp, &data, &len) != 0) {
if (asn1App_ReadFile(fp, &data, &len) != 0) {
ret = 1;
}

Expand All @@ -148,7 +148,7 @@ static int PrintBase64(FILE* fp)
unsigned char* data = NULL;

/* Load Base64 encoded file. */
if (ReadFile(fp, &data, &len) != 0) {
if (asn1App_ReadFile(fp, &data, &len) != 0) {
ret = 1;
}

Expand Down Expand Up @@ -251,7 +251,7 @@ static int PrintPem(FILE* fp, int pem_skip)
word32 len = 0;

/* Load PEM file. */
if (ReadFile(fp, &data, &len) != 0) {
if (asn1App_ReadFile(fp, &data, &len) != 0) {
ret = 1;
}

Expand Down
4 changes: 2 additions & 2 deletions examples/pem/pem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int StringToVal(const String2Val* map, int len, const char* str,
* @return 0 on success.
* @return 1 on failure.
*/
static int ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
static int pemApp_ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
{
int ret = 0;
word32 len = 0;
Expand Down Expand Up @@ -944,7 +944,7 @@ int main(int argc, char* argv[])
}
#endif
/* Read all of PEM file. */
if ((ret == 0) && (ReadFile(in_file, &in, &in_len) != 0)) {
if ((ret == 0) && (pemApp_ReadFile(in_file, &in, &in_len) != 0)) {
fprintf(stderr, "Reading file failed\n");
ret = 1;
}
Expand Down