[Xfce4-commits] [apps/xfce4-terminal] 01/01: Do not declare or define a reserved identifier
noreply at xfce.org
noreply at xfce.org
Wed Aug 3 11:52:35 CEST 2016
This is an automated email from the git hooks/post-receive script.
f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.
commit 40c21471eed8cbff5708d73356907bd661031d98
Author: Igor <f2404 at yandex.ru>
Date: Wed Aug 3 12:51:46 2016 +0300
Do not declare or define a reserved identifier
https://www.securecoding.cert.org/confluence/display/c/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier
---
terminal/Makefile.am | 4 ++--
terminal/terminal-app.h | 6 +++---
terminal/terminal-config.h.in | 6 +++---
terminal/terminal-encoding-action.h | 6 +++---
terminal/terminal-gdbus.h | 6 +++---
terminal/terminal-image-loader.h | 6 +++---
terminal/terminal-options.h | 6 +++---
terminal/terminal-preferences-dialog.h | 6 +++---
terminal/terminal-preferences.h | 6 +++---
terminal/terminal-private.h | 12 ++++++------
terminal/terminal-screen.h | 6 +++---
terminal/terminal-search-dialog.h | 6 +++---
terminal/terminal-util.h | 6 +++---
terminal/terminal-widget.h | 6 +++---
terminal/terminal-window-dropdown.h | 6 +++---
terminal/terminal-window.h | 6 +++---
16 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index 43d187d..33eafaa 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -110,10 +110,10 @@ terminal-enum-types.h: stamp-terminal-enum-types.h
@true
stamp-terminal-enum-types.h: terminal-preferences.h Makefile
$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
- --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <gtk/gtk.h>\nG_BEGIN_DECLS\n" \
+ --fhead "#ifndef TERMINAL_ENUM_TYPES_H\n#define TERMINAL_ENUM_TYPES_H\n#include <gtk/gtk.h>\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name at _get_type (void);\n#define TERMINAL_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* !__TERMINAL_ENUM_TYPES_H__ */" \
+ --ftail "G_END_DECLS\n\n#endif /* !TERMINAL_ENUM_TYPES_H */" \
terminal-preferences.h ) >> xgen-teth \
&& (cmp -s xgen-teth terminal-enum-types.h || cp xgen-teth terminal-enum-types.h ) \
&& rm -f xgen-teth \
diff --git a/terminal/terminal-app.h b/terminal/terminal-app.h
index 23f2b5f..84979d9 100644
--- a/terminal/terminal-app.h
+++ b/terminal/terminal-app.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_APP_H__
-#define __TERMINAL_APP_H__
+#ifndef TERMINAL_APP_H
+#define TERMINAL_APP_H
#include <gtk/gtk.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -62,4 +62,4 @@ gboolean terminal_app_process (TerminalApp *app,
G_END_DECLS
-#endif /* !__TERMINAL_APP_H__ */
+#endif /* !TERMINAL_APP_H */
diff --git a/terminal/terminal-config.h.in b/terminal/terminal-config.h.in
index b72c3a3..e3fce60 100644
--- a/terminal/terminal-config.h.in
+++ b/terminal/terminal-config.h.in
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_CONFIG_H__
-#define __TERMINAL_CONFIG_H__
+#ifndef TERMINAL_CONFIG_H
+#define TERMINAL_CONFIG_H
#include <glib.h>
@@ -31,4 +31,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* !__TERMINAL_CONFIG_H__ */
+#endif /* !TERMINAL_CONFIG_H */
diff --git a/terminal/terminal-encoding-action.h b/terminal/terminal-encoding-action.h
index 85b85b9..09976c1 100644
--- a/terminal/terminal-encoding-action.h
+++ b/terminal/terminal-encoding-action.h
@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_ENCODING_ACTION_H__
-#define __TERMINAL_ENCODING_ACTION_H__
+#ifndef TERMINAL_ENCODING_ACTION_H
+#define TERMINAL_ENCODING_ACTION_H
#include <gtk/gtk.h>
@@ -53,4 +53,4 @@ GtkTreeModel *terminal_encoding_model_new (const gchar *current,
G_END_DECLS
-#endif /* !__TERMINAL_ENCODING_ACTION_H__ */
+#endif /* !TERMINAL_ENCODING_ACTION_H */
diff --git a/terminal/terminal-gdbus.h b/terminal/terminal-gdbus.h
index 3ea45cb..a63c83a 100644
--- a/terminal/terminal-gdbus.h
+++ b/terminal/terminal-gdbus.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_DBUS_H__
-#define __TERMINAL_DBUS_H__
+#ifndef TERMINAL_GDBUS_H
+#define TERMINAL_GDBUS_H
#include <terminal/terminal-app.h>
@@ -32,4 +32,4 @@ gboolean terminal_gdbus_invoke_launch (gint argc,
G_END_DECLS
-#endif /* !__TERMINAL_DBUS_H__ */
+#endif /* !TERMINAL_GDBUS_H */
diff --git a/terminal/terminal-image-loader.h b/terminal/terminal-image-loader.h
index 9295ad3..4a427fa 100644
--- a/terminal/terminal-image-loader.h
+++ b/terminal/terminal-image-loader.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_IMAGE_LOADER_H__
-#define __TERMINAL_IMAGE_LOADER_H__
+#ifndef TERMINAL_IMAGE_LOADER_H
+#define TERMINAL_IMAGE_LOADER_H
#include <terminal/terminal-preferences.h>
@@ -44,4 +44,4 @@ GdkPixbuf *terminal_image_loader_load (TerminalImageLoader *loader,
G_END_DECLS
-#endif /* !__TERMINAL_IMAGE_LOADER_H__ */
+#endif /* !TERMINAL_IMAGE_LOADER_H */
diff --git a/terminal/terminal-options.h b/terminal/terminal-options.h
index 2462cc8..f6d3c8d 100644
--- a/terminal/terminal-options.h
+++ b/terminal/terminal-options.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_OPTIONS_H__
-#define __TERMINAL_OPTIONS_H__
+#ifndef TERMINAL_OPTIONS_H
+#define TERMINAL_OPTIONS_H
#include <glib.h>
@@ -97,4 +97,4 @@ void terminal_window_attr_free (TerminalWindowAttr *attr);
G_END_DECLS
-#endif /* !__TERMINAL_OPTIONS_H__ */
+#endif /* !TERMINAL_OPTIONS_H */
diff --git a/terminal/terminal-preferences-dialog.h b/terminal/terminal-preferences-dialog.h
index b6fcfce..98c3e43 100644
--- a/terminal/terminal-preferences-dialog.h
+++ b/terminal/terminal-preferences-dialog.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_PREFERENCES_DIALOG_H__
-#define __TERMINAL_PREFERENCES_DIALOG_H__
+#ifndef TERMINAL_PREFERENCES_DIALOG_H
+#define TERMINAL_PREFERENCES_DIALOG_H
#include <terminal/terminal-preferences.h>
@@ -40,4 +40,4 @@ GtkWidget *terminal_preferences_dialog_new (gboolean show_drop_down);
G_END_DECLS
-#endif /* !__TERMINAL_PREFERENCES_DIALOG_H__ */
+#endif /* !TERMINAL_PREFERENCES_DIALOG_H */
diff --git a/terminal/terminal-preferences.h b/terminal/terminal-preferences.h
index cb9cb1d..268f548 100644
--- a/terminal/terminal-preferences.h
+++ b/terminal/terminal-preferences.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_PREFERENCES_H__
-#define __TERMINAL_PREFERENCES_H__
+#ifndef TERMINAL_PREFERENCES_H
+#define TERMINAL_PREFERENCES_H
#include <gtk/gtk.h>
#include <libxfce4ui/libxfce4ui.h>
@@ -97,4 +97,4 @@ gboolean terminal_preferences_get_color (TerminalPreferences *prefer
G_END_DECLS
-#endif /* !__TERMINAL_PREFERENCES_H__ */
+#endif /* !TERMINAL_PREFERENCES_H */
diff --git a/terminal/terminal-private.h b/terminal/terminal-private.h
index 5f6c0dd..3570670 100644
--- a/terminal/terminal-private.h
+++ b/terminal/terminal-private.h
@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_PRIVATE_H__
-#define __TERMINAL_PRIVATE_H__
+#ifndef TERMINAL_PRIVATE_H
+#define TERMINAL_PRIVATE_H
#include <glib-object.h>
@@ -28,9 +28,9 @@ G_BEGIN_DECLS
/* macro for some debugging */
#define PRINT_TIME(desc) \
G_BEGIN_DECLS { \
- GTimeVal __tv; \
- g_get_current_time (&__tv); \
- g_print ("%ld.%ld: %s\n", __tv.tv_sec, __tv.tv_usec, desc); \
+ GTimeVal gtv; \
+ g_get_current_time (>v); \
+ g_print ("%ld.%ld: %s\n", gtv.tv_sec, gtv.tv_usec, desc); \
} G_END_DECLS
/* support macros for debugging */
@@ -72,4 +72,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* !__TERMINAL_PRIVATE_H__ */
+#endif /* !TERMINAL_PRIVATE_H */
diff --git a/terminal/terminal-screen.h b/terminal/terminal-screen.h
index 3fa6b2e..50469fb 100644
--- a/terminal/terminal-screen.h
+++ b/terminal/terminal-screen.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_SCREEN_H__
-#define __TERMINAL_SCREEN_H__
+#ifndef TERMINAL_SCREEN_H
+#define TERMINAL_SCREEN_H
#include <gtk/gtk.h>
@@ -111,4 +111,4 @@ void terminal_screen_update_font (TerminalScreen *scree
G_END_DECLS
-#endif /* !__TERMINAL_SCREEN_H__ */
+#endif /* !TERMINAL_SCREEN_H */
diff --git a/terminal/terminal-search-dialog.h b/terminal/terminal-search-dialog.h
index 4c8f5e7..489ff02 100644
--- a/terminal/terminal-search-dialog.h
+++ b/terminal/terminal-search-dialog.h
@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_SEARCH_DIALOG_H__
-#define __TERMINAL_SEARCH_DIALOG_H__
+#ifndef TERMINAL_SEARCH_DIALOG_H
+#define TERMINAL_SEARCH_DIALOG_H
#include <vte/vte.h>
@@ -51,4 +51,4 @@ void terminal_search_dialog_present (TerminalSearchDialog *dialog
G_END_DECLS
-#endif /* !__TERMINAL_SEARCH_DIALOG_H__ */
+#endif /* !TERMINAL_SEARCH_DIALOG_H */
diff --git a/terminal/terminal-util.h b/terminal/terminal-util.h
index c464ec4..6b7f453 100644
--- a/terminal/terminal-util.h
+++ b/terminal/terminal-util.h
@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_DIALOGS_H__
-#define __TERMINAL_DIALOGS_H__
+#ifndef TERMINAL_UTIL_H
+#define TERMINAL_UTIL_H
#include <gtk/gtk.h>
@@ -28,4 +28,4 @@ void terminal_util_activate_window (GtkWindow *window);
G_END_DECLS
-#endif /* !__TERMINAL_DIALOGS_H__ */
+#endif /* !TERMINAL_UTIL_H */
diff --git a/terminal/terminal-widget.h b/terminal/terminal-widget.h
index 11f3858..997fa28 100644
--- a/terminal/terminal-widget.h
+++ b/terminal/terminal-widget.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_WIDGET_H__
-#define __TERMINAL_WIDGET_H__
+#ifndef TERMINAL_WIDGET_H
+#define TERMINAL_WIDGET_H
#include <vte/vte.h>
@@ -51,4 +51,4 @@ GType terminal_widget_get_type (void) G_GNUC_CONST;
G_END_DECLS
-#endif /* !__TERMINAL_WIDGET_H__ */
+#endif /* !TERMINAL_WIDGET_H */
diff --git a/terminal/terminal-window-dropdown.h b/terminal/terminal-window-dropdown.h
index 360a3a8..171772e 100644
--- a/terminal/terminal-window-dropdown.h
+++ b/terminal/terminal-window-dropdown.h
@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_WINDOW_DROPDOWN_DROPDOWN_H__
-#define __TERMINAL_WINDOW_DROPDOWN_DROPDOWN_H__
+#ifndef TERMINAL_WINDOW_DROPDOWN_DROPDOWN_H
+#define TERMINAL_WINDOW_DROPDOWN_DROPDOWN_H
#include <terminal/terminal-screen.h>
#include <terminal/terminal-options.h>
@@ -51,4 +51,4 @@ void terminal_window_dropdown_get_size (TerminalWindowDro
G_END_DECLS
-#endif /* !__TERMINAL_WINDOW_DROPDOWN_H__ */
+#endif /* !TERMINAL_WINDOW_DROPDOWN_H */
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index 00ce558..a84cc9d 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __TERMINAL_WINDOW_H__
-#define __TERMINAL_WINDOW_H__
+#ifndef TERMINAL_WINDOW_H
+#define TERMINAL_WINDOW_H
#include <terminal/terminal-screen.h>
#include <terminal/terminal-options.h>
@@ -108,4 +108,4 @@ GSList *terminal_window_get_restart_command (TerminalWindow *window
G_END_DECLS
-#endif /* !__TERMINAL_WINDOW_H__ */
+#endif /* !TERMINAL_WINDOW_H */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list