Update FSF address

[lttv.git] / lttv / lttv / attribute.c

diff --git a/lttv/lttv/attribute.c b/lttv/lttv/attribute.c
index 243fe0240d1286d9e85598233d0708c7e7b82d55..1a8cbafe733631fad63487b9d28197d17d8b34a5 100644 (file)
--- a/lttv/lttv/attribute.c
+++ b/lttv/lttv/attribute.c
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -22,8 +22,7 @@
 
 #include <string.h>
 #include <lttv/attribute.h>
-#include <ltt/ltt.h>
-#include <ltt/compiler.h>
+#include <lttv/compiler.h>
 
 typedef union _AttributeValue {
        int dv_int;
@@ -487,13 +486,15 @@ lttv_attribute_read_xml(LttvAttribute *self, FILE *fp)
 
        LttvAttribute *subtree;
 
-       fscanf(fp,"<ATTRS>");
+       res = fscanf(fp, "<ATTRS>");
+       g_assert(res > 0);
        while(1) {
                res = fscanf(fp, "<ATTR NAME=\"%256[^\"]\" TYPE=%10[^ >]", buffer, type);
                g_assert(res == 2);
                name = g_quark_from_string(buffer);
                if(strcmp(type, "ATTRS") == 0) {
-                       fscanf(fp, ">");
+                       res = fscanf(fp, ">");
+                       g_assert(res > 0);
                        subtree = lttv_attribute_find_subdir(self, name);
                        lttv_attribute_read_xml(subtree, fp);
                }
@@ -553,11 +554,13 @@ lttv_attribute_read_xml(LttvAttribute *self, FILE *fp)
                }
                else if(strcmp(type, "NONE") == 0) {
                        value = lttv_attribute_add(self, name, LTTV_NONE);
-                       fscanf(fp, "/>");
+                       res = fscanf(fp, "/>");
+                       g_assert(res > 0);
                }
                else g_error("Unknown type to read");
        }
-       fscanf(fp,"</ATTRS>");
+       res = fscanf(fp, "</ATTRS>");
+       g_assert(res > 0);
 }
 
 static LttvAttribute *