summaryrefslogtreecommitdiff
path: root/mate-panel/panel-applet-info.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-08-04 13:11:42 +0200
committerraveit65 <[email protected]>2020-09-07 09:11:05 +0200
commit8f8b7316cc7504a4618705c562ead1ae65dabbdc (patch)
treec536e6c8079781851f2456528042e19497ee5315 /mate-panel/panel-applet-info.c
parent59da25f28bc2678cc38bc1def53ca1c4dbf9cc0b (diff)
downloadmate-panel-8f8b7316cc7504a4618705c562ead1ae65dabbdc.tar.bz2
mate-panel-8f8b7316cc7504a4618705c562ead1ae65dabbdc.tar.xz
Remove variableScope warnings reported by cppcheck
cppcheck --enable=all . 2> err.txt grep variableScope err.txt
Diffstat (limited to 'mate-panel/panel-applet-info.c')
-rw-r--r--mate-panel/panel-applet-info.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/mate-panel/panel-applet-info.c b/mate-panel/panel-applet-info.c
index 3ba05a67..c3862358 100644
--- a/mate-panel/panel-applet-info.c
+++ b/mate-panel/panel-applet-info.c
@@ -38,28 +38,25 @@ struct _MatePanelAppletInfo {
MatePanelAppletInfo *
mate_panel_applet_info_new (const gchar *iid,
- const gchar *name,
- const gchar *comment,
- const gchar *icon,
- const gchar **old_ids,
- gboolean x11_supported,
- gboolean wayland_supported)
+ const gchar *name,
+ const gchar *comment,
+ const gchar *icon,
+ const gchar **old_ids,
+ gboolean x11_supported,
+ gboolean wayland_supported)
{
- MatePanelAppletInfo *info;
+ MatePanelAppletInfo *info = g_slice_new0 (MatePanelAppletInfo);
- info = g_slice_new0 (MatePanelAppletInfo);
-
- info->iid = g_strdup (iid);
- info->name = g_strdup (name);
+ info->iid = g_strdup (iid);
+ info->name = g_strdup (name);
info->comment = g_strdup (comment);
- info->icon = g_strdup (icon);
+ info->icon = g_strdup (icon);
/* MateComponent compatibility */
if (old_ids != NULL) {
- int i, len;
-
- len = g_strv_length ((gchar **) old_ids);
- if (len > 0) {
+ int len;
+ if ((len = g_strv_length ((gchar **) old_ids)) > 0) {
+ int i;
info->old_ids = g_new0 (gchar *, len + 1);
for (i = 0; i < len; i++)
info->old_ids[i] = g_strdup (old_ids[i]);