[vlc-commits] help: fix loop invariant for string choices

Rémi Denis-Courmont git at videolan.org
Sun Aug 19 18:01:44 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 19 19:01:07 2012 +0300| [356da4f8d726ef09056d584977cff1c7b9370655] | committer: Rémi Denis-Courmont

help: fix loop invariant for string choices

Regression from d70cda889b72595f17df9bb15700f32420883161.

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

 src/config/help.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/help.c b/src/config/help.c
index 7f41980..ae1b457 100644
--- a/src/config/help.c
+++ b/src/config/help.c
@@ -453,7 +453,7 @@ static void Usage (vlc_object_t *p_this, char const *psz_search)
                     psz_bra = OPTION_VALUE_SEP "{";
                     psz_type = psz_buffer;
                     psz_buffer[0] = '\0';
-                    for( i = 0; p_item->ppsz_list[i]; i++ )
+                    for( i = 0; i < p_item->i_list; i++ )
                     {
                         if( i ) strcat( psz_buffer, "," );
                         strcat( psz_buffer, p_item->ppsz_list[i] );
@@ -481,7 +481,7 @@ static void Usage (vlc_object_t *p_this, char const *psz_search)
                     psz_bra = OPTION_VALUE_SEP "{";
                     psz_type = psz_buffer;
                     psz_buffer[0] = '\0';
-                    for( i = 0; p_item->ppsz_list_text[i]; i++ )
+                    for( i = 0; i < p_item->i_list; i++ )
                     {
                         if( i ) strcat( psz_buffer, ", " );
                         sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)",



More information about the vlc-commits mailing list