devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Adapt to g_string_free glib 2.75.3 change

Browse Source 
glib 2.75.3 changes warning behaviour of `g_string_free()`.
See:
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3219
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3226

Use this opportunity to replace the use of GString with
`g_strdup_printf()` where possible.
Otherwise correctly take the return value of `g_string_free()`
which is nicer anyways.
This commit is contained in:
Michael Vetter
2023-03-17 23:58:33 +01:00
parent e5e8ff221a
commit e59c401c84
17 changed files with 44 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pgp/gpg.c
View File

@@ -100,8 +100,7 @@ _p_gpg_passphrase_cb(void* hook, const char* uid_hint, const char* passphrase_in
if (passphrase_attempt) {
free(passphrase_attempt);
}
passphrase_attempt = pass_term->str;
g_string_free(pass_term, FALSE);
passphrase_attempt = g_string_free(pass_term, FALSE);
gpgme_io_write(fd, passphrase_attempt, strlen(passphrase_attempt));
}
@@ -768,10 +767,7 @@ p_gpg_format_fp_str(char* fp)
}
}
char* result = format->str;
g_string_free(format, FALSE);
return result;
return g_string_free(format, FALSE);
}
static char*
@@ -801,18 +797,7 @@ _remove_header_footer(char* str, const char* const footer)
static char*
_add_header_footer(const char* const str, const char* const header, const char* const footer)
{
GString* result_str = g_string_new("");
g_string_append(result_str, header);
g_string_append(result_str, "\n\n");
g_string_append(result_str, str);
g_string_append(result_str, "\n");
g_string_append(result_str, footer);
char* result = result_str->str;
g_string_free(result_str, FALSE);
return result;
return g_strdup_printf("%s\n\n%s\n%s", header, str, footer);
}
static void