diff options
author | Mathias Gumz <akira@fluxbox.org> | 2015-01-16 09:52:00 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2015-01-16 09:52:00 (GMT) |
commit | 772ec145952bfddc7888504f22859df1f24f8d5e (patch) | |
tree | 58356cf14f52792db6fda3c482a5b9865f711e56 /src/FbTk/FbWindow.cc | |
parent | e37cad714c77b24e4421f5dc1b3d01fe685b637a (diff) | |
download | fluxbox-772ec145952bfddc7888504f22859df1f24f8d5e.zip fluxbox-772ec145952bfddc7888504f22859df1f24f8d5e.tar.bz2 |
Fix uninitialized variables; cosmetics
Note: I expect only modern compilers will hit the source of fluxbox. It
seems futile to guard stdlib headers while demanding <algorithm> etc. This
should trim down the noise in the source quite a bit.
Diffstat (limited to 'src/FbTk/FbWindow.cc')
-rw-r--r-- | src/FbTk/FbWindow.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index fb1c7af..1930d4e 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -491,7 +491,7 @@ struct TextPropPtr { | |||
491 | }; | 491 | }; |
492 | } | 492 | } |
493 | 493 | ||
494 | long FbWindow::cardinalProperty(Atom prop,bool*exists) const { | 494 | long FbWindow::cardinalProperty(Atom prop, bool* exists) const { |
495 | Atom type; | 495 | Atom type; |
496 | int format; | 496 | int format; |
497 | unsigned long nitems, bytes_after; | 497 | unsigned long nitems, bytes_after; |
@@ -549,10 +549,8 @@ FbTk::FbString FbWindow::textProperty(Atom prop,bool*exists) const { | |||
549 | ret = FbStringUtil::LocaleStrToFb(stringlist[0]); | 549 | ret = FbStringUtil::LocaleStrToFb(stringlist[0]); |
550 | } | 550 | } |
551 | 551 | ||
552 | // they all use stringlist | 552 | XFreeStringList(stringlist); |
553 | if (stringlist) { | 553 | |
554 | XFreeStringList(stringlist); | ||
555 | } | ||
556 | if (exists) *exists=true; | 554 | if (exists) *exists=true; |
557 | return ret; | 555 | return ret; |
558 | } | 556 | } |