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.

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

Change: remove leading g_ that looks like glib #807

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Change: remove leading g_ that looks like glib #807

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 util/gpgmeutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,10 @@ create_all_certificates_trustlist (gpgme_ctx_t ctx, const char *homedir)
gpgme_key_t key;
gchar *trustlist_filename;
GString *trustlist_content;
GError *g_err;
GError *error;
gpgme_error_t err;

g_err = NULL;
error = NULL;
gpgme_set_pinentry_mode (ctx, GPGME_PINENTRY_MODE_CANCEL);

trustlist_filename = g_build_filename (homedir, "trustlist.txt", NULL);
Expand All @@ -450,11 +450,11 @@ create_all_certificates_trustlist (gpgme_ctx_t ctx, const char *homedir)
}

if (g_file_set_contents (trustlist_filename, trustlist_content->str,
trustlist_content->len, &g_err)
trustlist_content->len, &error)
== FALSE)
{
g_warning ("%s: Could not write trust list: %s", __func__,
g_err->message);
error->message);
g_free (trustlist_filename);
g_string_free (trustlist_content, TRUE);
return -1;
Expand Down
12 changes: 3 additions & 9 deletions util/mqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,6 @@ mqtt_init_auth (const char *server_uri, const char *username,
const char *password)
{
mqtt_t *mqtt = NULL;
const char *g_server_uri;
const char *g_username;
const char *g_password;

g_debug ("%s: start", __func__);

Expand All @@ -399,16 +396,13 @@ mqtt_init_auth (const char *server_uri, const char *username,
return -1;
}
g_debug ("%s: client id set: %s", __func__, mqtt->client_id);
g_server_uri = mqtt_get_global_server_uri ();
if (g_server_uri == NULL)
if (mqtt_get_global_server_uri () == NULL)
mqtt_set_global_server_uri (server_uri);

g_username = mqtt_get_global_username ();
if (g_username == NULL)
if (mqtt_get_global_username () == NULL)
mqtt_set_global_username (username);

g_password = mqtt_get_global_password ();
if (g_password == NULL)
if (mqtt_get_global_password () == NULL)
mqtt_set_global_password (password);

if (mqtt_connect (mqtt, server_uri, username, password))
Expand Down