C89 → C99

diff --git a/batteryviewer.c b/batteryviewer.c
index 6c4304cd643bde66f9dee732497724adc25c5308..3b5add9a9d90b78f2a4ff569166d355b685341b5 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -7,18 +7,15 @@ static void print_hello(GtkWidget *widget __attribute__((unused)),
 
 static void activate(GtkApplication *app,
                      gpointer user_data __attribute__((unused))) {
 
 static void activate(GtkApplication *app,
                      gpointer user_data __attribute__((unused))) {

-  GtkWidget *window;
-  GtkWidget *button;
-  GtkWidget *button_box;

 
 

-  window = gtk_application_window_new(app);
+  GtkWidget *window = gtk_application_window_new(app);

   gtk_window_set_title(GTK_WINDOW(window), "Window");
   gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
 
   gtk_window_set_title(GTK_WINDOW(window), "Window");
   gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
 

-  button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+  GtkWidget *button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);

   gtk_container_add(GTK_CONTAINER(window), button_box);
 
   gtk_container_add(GTK_CONTAINER(window), button_box);
 

-  button = gtk_button_new_with_label("Hello World");
+  GtkWidget *button = gtk_button_new_with_label("Hello World");

   g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL);
   g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy),
                            window);
   g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL);
   g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy),
                            window);


@@ -28,12 +25,11 @@ static void activate(GtkApplication *app,
 }
 
 int main(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {

-  GtkApplication *app;
-  int status;

 
 

-  app = gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  GtkApplication *app =
+      gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);

   g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
   g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);

-  status = g_application_run(G_APPLICATION(app), argc, argv);
+  int status = g_application_run(G_APPLICATION(app), argc, argv);

   g_object_unref(app);
 
   return status;
   g_object_unref(app);
 
   return status;