[vlc-commits] Remove unused counter_t members

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 29 19:22:18 2011 +0200| [9697eabdc1130eeed082ce81a0a4b5f90d9347d4] | committer: Rémi Denis-Courmont

Remove unused counter_t members

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9697eabdc1130eeed082ce81a0a4b5f90d9347d4
---

 include/vlc_messages.h |    3 ---
 src/misc/stats.c       |    6 ------
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index 4ff9118..e6352d8 100644
--- a/include/vlc_messages.h
+++ b/include/vlc_messages.h
@@ -122,10 +122,7 @@ struct counter_sample_t
 
 struct counter_t
 {
-    unsigned int        i_id;
-    char              * psz_name;
     int                 i_type;
-    void              * p_obj;
     int                 i_compute_type;
     int                 i_samples;
     counter_sample_t ** pp_samples;
diff --git a/src/misc/stats.c b/src/misc/stats.c
index ba90eb4..70b03f9 100644
--- a/src/misc/stats.c
+++ b/src/misc/stats.c
@@ -67,7 +67,6 @@ counter_t * stats_CounterCreate( vlc_object_t *p_this,
     p_counter->i_type = i_type;
     p_counter->i_samples = 0;
     p_counter->pp_samples = NULL;
-    p_counter->psz_name = NULL;
 
     p_counter->update_interval = 0;
     p_counter->last_update = 0;
@@ -235,7 +234,6 @@ void stats_CounterClean( counter_t *p_c )
             free( p_s );
             i--;
         }
-        free( p_c->psz_name );
         free( p_c );
     }
 }
@@ -317,10 +315,6 @@ static int CounterUpdate( vlc_object_t *p_handler,
                 p_counter->pp_samples[0]->value.f_float += val.f_float;
                 if( new_val )
                     new_val->f_float = p_counter->pp_samples[0]->value.f_float;
-            default:
-                msg_Err( p_handler, "Trying to increment invalid variable %s",
-                         p_counter->psz_name );
-                return VLC_EGENERIC;
             }
         }
         break;