devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 01:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change char->free to auto_char char for autocleanup

Browse Source 
Replace `gchar` and `g_free` to `auto_gchar`
Correct certain  `char` functions/variables to `gchar`

Related to #1819.

Edited by @jubalh.
This commit is contained in:
John Hernandez
2023-07-11 13:23:58 +02:00
parent 245d69deb6
commit e1d137f4e6
62 changed files with 498 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common.c
View File

@@ -143,11 +143,10 @@ str_replace(const char* string, const char* substr,
head = newstr;
while ((tok = strstr(head, substr))) {
char* oldstr = newstr;
auto_char char* oldstr = newstr;
newstr = malloc(strlen(oldstr) - strlen(substr) + strlen(replacement) + 1);
if (newstr == NULL) {
free(oldstr);
return NULL;
}
@@ -159,7 +158,6 @@ str_replace(const char* string, const char* substr,
memset(newstr + strlen(oldstr) - strlen(substr) + strlen(replacement), 0, 1);
head = newstr + (tok - oldstr) + strlen(replacement);
free(oldstr);
}
return newstr;
@@ -282,10 +280,10 @@ _data_callback(void* ptr, size_t size, size_t nmemb, void* data)
return realsize;
}
char*
get_file_or_linked(char* loc, char* basedir)
gchar*
get_file_or_linked(gchar* loc, gchar* basedir)
{
char* true_loc = NULL;
gchar* true_loc = NULL;
// check for symlink
if (g_file_test(loc, G_FILE_TEST_IS_SYMLINK)) {
@@ -293,13 +291,13 @@ get_file_or_linked(char* loc, char* basedir)
// if relative, add basedir
if (!g_str_has_prefix(true_loc, "/") && !g_str_has_prefix(true_loc, "~")) {
char* tmp = g_strdup_printf("%s/%s", basedir, true_loc);
free(true_loc);
gchar* tmp = g_strdup_printf("%s/%s", basedir, true_loc);
g_free(true_loc);
true_loc = tmp;
}
// use given location
} else {
true_loc = strdup(loc);
true_loc = g_strdup(loc);
}
return true_loc;