test commit 2

diff --git a/cmd/smyrna/gui/beacon.c b/cmd/smyrna/gui/beacon.c
index bfca0288ef01eddfa6723c13224c664ab5605b90..6cbc5eb6d86627cbf78069045f38fe1c78ff1f2c 100644 (file)
--- a/cmd/smyrna/gui/beacon.c
+++ b/cmd/smyrna/gui/beacon.c
@@ -277,7 +277,6 @@ int draw_node_hint_boxes(void)
                        strcat(buf,agnameof(e->Node1->Node));
                strcat(buf," - ");
                strcat(buf,agnameof(e->Node2->Node));
-
                dx = (x1+x2)/2.0;
                dy = (y1+y2)/2.0;
                dz = (z1+z2)/2.0;

diff --git a/cmd/smyrna/gui/menucallbacks.h b/cmd/smyrna/gui/menucallbacks.h
index 71e5bb1a218d36079ee4f4d4926bdfae7ab80c88..42048edd42ecc2bd6fe041432cee6de662009845 100755 (executable)
--- a/cmd/smyrna/gui/menucallbacks.h
+++ b/cmd/smyrna/gui/menucallbacks.h
@@ -28,7 +28,6 @@ _BB void mSaveAsSlot(GtkWidget * widget, gpointer user_data);
 _BB void mCloseSlot(GtkWidget * widget, gpointer user_data);
 _BB void mOptionsSlot(GtkWidget * widget, gpointer user_data);
 _BB void mQuitSlot(GtkWidget * widget, gpointer user_data);
-
 //edit
 _BB void mCutSlot(GtkWidget * widget, gpointer user_data);
 _BB void mCopySlot(GtkWidget * widget, gpointer user_data);

diff --git a/cmd/smyrna/gui/topviewsettings.c b/cmd/smyrna/gui/topviewsettings.c
index 4b8855a5a5891f773e979eb3775366a26eca6cf7..7547daf3bb4ef51fe854967896df4ff76181e329 100644 (file)
--- a/cmd/smyrna/gui/topviewsettings.c
+++ b/cmd/smyrna/gui/topviewsettings.c
@@ -50,12 +50,12 @@ static int set_color_button_widget(char *attribute, char *widget_name)
     buf = agget(view->g[view->activeGraph], attribute);
     if ((!buf) || (strcmp(buf, "") == 0))
        buf = agget(view->default_attributes, attribute);
-    if (buf) {
-       colorxlate(buf, &cl, RGBA_DOUBLE);
-       color.red = (int) (cl.u.RGBA[0] * 65535.0);
-       color.green = (int) (cl.u.RGBA[1] * 65535.0);
-       color.blue = (int) (cl.u.RGBA[2] * 65535.0);
-//              gdk_color_parse(buf,&color);
+    if (buf) 
+       {
+               colorxlate(buf, &cl, RGBA_DOUBLE);
+               color.red = (int) (cl.u.RGBA[0] * 65535.0);
+               color.green = (int) (cl.u.RGBA[1] * 65535.0);
+               color.blue = (int) (cl.u.RGBA[2] * 65535.0);
        gtk_color_button_set_color((GtkColorButton *)
                                   glade_xml_get_widget(xml, widget_name),
                                   &color);

diff --git a/cmd/smyrna/gvprpipe.c b/cmd/smyrna/gvprpipe.c
index 61feb7cf7b36b310bc91d395920e08efb19974bb..fbb31e20a1cd2c3f36d98bc8216c19bd0a080c07 100644 (file)
--- a/cmd/smyrna/gvprpipe.c
+++ b/cmd/smyrna/gvprpipe.c
@@ -36,7 +36,8 @@ static ssize_t outfn (void* sp, const char *buf, size_t nbyte, void* dp)
        gtkbuf = gtk_text_view_get_buffer((GtkTextView*) glade_xml_get_widget(xml,"gvprtextoutput"));
        /*set iterator to the end of the buffer*/
     gtk_text_buffer_get_end_iter (gtkbuf,&endit);
-       /*insert buf to the end*/
+
+       /* insert buf to the end */
        gtk_text_buffer_insert(gtkbuf,&endit,buf,nbyte);
        return nbyte;
 }

diff --git a/cmd/smyrna/selection.h b/cmd/smyrna/selection.h
index 29b2bf7a567dd994ee85f2f4c884b56d443e33d0..7586f2cddd5d015faffa780e9835e29b8ef99821 100644 (file)
--- a/cmd/smyrna/selection.h
+++ b/cmd/smyrna/selection.h
@@ -33,6 +33,7 @@ extern int SelectBeziers(sdot_op * op);
 extern int SelectEllipse(sdot_op * op);
 extern int SelectPolygon(sdot_op * op);
 extern int SelectPolyline(sdot_op * op);
+
 extern int SelectText(sdot_op * op);
 extern int SelectImage(sdot_op * op);
 

diff --git a/cmd/smyrna/viewport.h b/cmd/smyrna/viewport.h
index 060fb7d67e4f2c780cb2fb78e2556f2c3d33254a..9490744f345ba53ee7c60d3c0f8d1b08dd257862 100755 (executable)
--- a/cmd/smyrna/viewport.h
+++ b/cmd/smyrna/viewport.h
@@ -23,6 +23,7 @@
 #include "xdot.h"
 #include "cgraph.h"
 
+
 void init_viewport(ViewInfo * view);
 void set_viewport_settings_from_template(ViewInfo * view, Agraph_t *);
 void clear_viewport(ViewInfo * view);

diff --git a/lib/xdot/xdot.c b/lib/xdot/xdot.c
index 61543113e17f13adf388d1683b16a7f708463445..53fbe0f4358241bb0e27e43538507894c6a2a4b1 100755 (executable)
--- a/lib/xdot/xdot.c
+++ b/lib/xdot/xdot.c
@@ -658,8 +658,9 @@ void free_xdotset(xdot_set* s)
 {
        int idx;
        if (!s)
+       {
                return ;
-
+       }
        for (idx=0;idx < s->cnt ; idx ++)
        {
                if (s->obj[idx])