[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-45-g3771981
Rémi Cardona
nobody at users.sourceforge.net
Tue Mar 8 01:03:26 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 3771981f408d032a4b9182aa345de777e5b404cb (commit)
from 3241e116a387dd131a159c0e0c134955eac590b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3771981f408d032a4b9182aa345de777e5b404cb
Author: Rémi Cardona <remi at gentoo.org>
Date: Mon Mar 7 23:22:58 2011 +0100
Group various 'ancien_tiers_etat' decls and defs together
Readelf confirms that both variables are completely separate: modifying
'ancien_tiers_etat' in etats_calcul.c is never seen by code in
etats_affiche.c and vice versa.
This is probably not what was intended.
For now, I'll leave this variable alone until we figure out what to do with
it. I'm just moving the decls around to make the issue more obvious when
we revisit the issue later on.
-----------------------------------------------------------------------
Changes:
diff --git a/src/etats_affiche.c b/src/etats_affiche.c
index fd0ef54..2ecb842 100644
--- a/src/etats_affiche.c
+++ b/src/etats_affiche.c
@@ -60,13 +60,15 @@ static void etat_affiche_attach_vsep ( int x, int x2, int y, int y2);
-
+/* WTF??? See etats_calculs.c too... */
static gint ancien_tiers_etat;
+extern gint ancien_tiers_etat;
+
+
static gint titres_affiches;
/*START_EXTERN*/
extern gint ancien_compte_etat;
-extern gint ancien_tiers_etat;
extern gint ancienne_categ_etat;
extern gint ancienne_categ_speciale_etat;
extern gint ancienne_ib_etat;
diff --git a/src/etats_calculs.c b/src/etats_calculs.c
index 823959b..0dde5c0 100644
--- a/src/etats_calculs.c
+++ b/src/etats_calculs.c
@@ -79,12 +79,13 @@ static gint dernier_no_rappr; /* quand on a choisi le plus grand, contient l
struct struct_etat_affichage * etat_affichage_output;
-
+/* Uh, what?! See etats_affiche.c as well... */
static gint ancien_tiers_etat;
+extern gint ancien_tiers_etat;
+
/*START_EXTERN*/
extern gint ancien_compte_etat;
-extern gint ancien_tiers_etat;
extern gint ancienne_categ_etat;
extern gint ancienne_categ_speciale_etat;
extern gint ancienne_ib_etat;
hooks/post-receive
--
grisbi
More information about the cvs
mailing list