X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fcounter.h;h=2b60638fe698da9f4e6e38903289e3169c69f6f6;hb=f7ee5f2c535d6650ecef9af8653dcbf683cc9db2;hp=6d251b2f72dea7a961b7a75798acf8a2bee0b29a;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm

diff --git a/ir/stat/counter.h b/ir/stat/counter.h
index 6d251b2f7..2b60638fe 100644
--- a/ir/stat/counter.h
+++ b/ir/stat/counter.h
@@ -1,15 +1,15 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/counter.h
- * Purpose:     Statistics for Firm. Counter implementation.
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
-#ifndef _COUNTER_H_
-#define _COUNTER_H_
+
+/**
+ * @file
+ * @brief   Statistics for Firm. Counter implementation.
+ * @author  Michael Beck
+ */
+#ifndef FIRM_STAT_COUNTER_H
+#define FIRM_STAT_COUNTER_H
 
 #include <string.h>
 #include <limits.h>
@@ -21,7 +21,7 @@
 #define STAT_CNT_NUM 1
 #endif
 
-typedef struct _counter_t {
+typedef struct counter_t {
 	unsigned cnt[STAT_CNT_NUM];
 } counter_t;
 
@@ -31,7 +31,7 @@ typedef struct _counter_t {
 /**
  * increase a counter
  */
-static INLINE void cnt_inc(counter_t *cnt)
+static inline void cnt_inc(counter_t *cnt)
 {
 	int i;
 
@@ -44,12 +44,12 @@ static INLINE void cnt_inc(counter_t *cnt)
 /**
  * decrease a counter
  */
-static INLINE void cnt_dec(counter_t *cnt)
+static inline void cnt_dec(counter_t *cnt)
 {
 	int i;
 
 	for (i = 0; i < STAT_CNT_NUM; ++i) {
-		if (--cnt->cnt[i] != -1)
+		if (--cnt->cnt[i] != (unsigned) -1)
 			break;
 	}
 }
@@ -57,7 +57,7 @@ static INLINE void cnt_dec(counter_t *cnt)
 /**
  * set a counter to zero
  */
-static INLINE void cnt_clr(counter_t *cnt)
+static inline void cnt_clr(counter_t *cnt)
 {
 	memset(cnt->cnt, 0, sizeof(cnt->cnt));
 }
@@ -65,7 +65,7 @@ static INLINE void cnt_clr(counter_t *cnt)
 /**
  * add a counter to another
  */
-static INLINE void cnt_add(counter_t *dst, const counter_t *src)
+static inline void cnt_add(counter_t *dst, const counter_t *src)
 {
 	int i, carry = 0;
 
@@ -83,7 +83,7 @@ static INLINE void cnt_add(counter_t *dst, const counter_t *src)
 /**
  * add an (positive) integer to an counter
  */
-static INLINE void cnt_add_i(counter_t *dst, int src)
+static inline void cnt_add_i(counter_t *dst, int src)
 {
 	int i;
 	unsigned carry = src;
@@ -103,10 +103,11 @@ static INLINE void cnt_add_i(counter_t *dst, int src)
 /**
  * compare two counter
  */
-static INLINE int cnt_cmp(const counter_t *a, const counter_t *b)
+static inline int cnt_cmp(const counter_t *a, const counter_t *b)
 {
 	int i;
-	unsigned va, vb;
+	unsigned va = 0;
+	unsigned vb = 0;
 
 	for (i = STAT_CNT_NUM - 1 ; i >= 0; --i) {
 		va = a->cnt[i];
@@ -124,7 +125,7 @@ static INLINE int cnt_cmp(const counter_t *a, const counter_t *b)
 /**
  * convert a counter into a double
  */
-static INLINE double cnt_to_dbl(const counter_t *a)
+static inline double cnt_to_dbl(const counter_t *a)
 {
 	int i;
 	double res = 0.0, scale = 1.0, tmp;
@@ -143,7 +144,7 @@ static INLINE double cnt_to_dbl(const counter_t *a)
 /**
  * convert a counter into an unsigned
  */
-static INLINE unsigned cnt_to_uint(const counter_t *a)
+static inline unsigned cnt_to_uint(const counter_t *a)
 {
 	int i;
 
@@ -157,7 +158,7 @@ static INLINE unsigned cnt_to_uint(const counter_t *a)
 /**
  * check, if a counter is equal to an unsigned
  */
-static INLINE int cnt_eq(const counter_t *a, unsigned value)
+static inline int cnt_eq(const counter_t *a, unsigned value)
 {
 	int i;
 
@@ -171,7 +172,7 @@ static INLINE int cnt_eq(const counter_t *a, unsigned value)
 /**
  * check, if a counter as greater than an unsigned
  */
-static INLINE int cnt_gt(const counter_t *a, unsigned value)
+static inline int cnt_gt(const counter_t *a, unsigned value)
 {
 	int i;
 
@@ -182,4 +183,4 @@ static INLINE int cnt_gt(const counter_t *a, unsigned value)
 	return a->cnt[0] > value;
 }
 
-#endif /* _COUNTER_H_ */
+#endif /* FIRM_STAT_COUNTER_H */