Re-order initialization so that variables are defined in verbose mode;

simplify code

diff --git a/lib/pack/pack.c b/lib/pack/pack.c
index e0d631319ceea9fe0efef43d59a28cef7ad9c4b2..ea530d7e32ab77831ed878051d0e9355a1833fa7 100644 (file)
--- a/lib/pack/pack.c
+++ b/lib/pack/pack.c
@@ -1323,13 +1323,14 @@ int getPack(Agraph_t * g, int not_def, int dflt)
 pack_mode 
 getPackInfo(Agraph_t * g, pack_mode dflt, int dfltMargin, pack_info* pinfo)
 {
-    pack_mode pmode = getPackModeInfo(g, dflt, pinfo);
+    assert (pinfo);
+
     pinfo->margin = getPack(g, dfltMargin, dfltMargin);
     pinfo->doSplines = 0;
-    pinfo->mode = pmode;
     pinfo->fixed = 0;
+    getPackModeInfo(g, dflt, pinfo);
 
-    return pmode;
+    return pinfo->mode;
 }