diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-04-04 13:53:03 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2015-04-04 11:55:27 +0000 |
| commit | 267e169252f265eb1e6656c7c85563038d08d406 (patch) | |
| tree | 54fd69f55f49d79b44bab7cc3ef6a1c0f502cca2 /wiretap | |
| parent | 66c4c14ceb5d3881b211d3c7557ba755bc385dbe (diff) | |
try to silence the OS X builbots by renaming index to idx
mp2t.c: In function 'mp2t_find_next_pcr':
mp2t.c:160: warning: declaration of 'index' shadows a global declaration
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/string.h:125:
warning: shadowed declaration is here
mp2t.c: In function 'mp2t_bits_per_second':
mp2t.c:208: warning: declaration of 'index' shadows a global declaration
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/string.h:125:
warning: shadowed declaration is here
Change-Id: Ia8591990409a0730d913c50d80b6950425a22052
Reviewed-on: https://code.wireshark.org/review/7905
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/mp2t.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c index 3d111e5517..7ba2f83ed6 100644 --- a/wiretap/mp2t.c +++ b/wiretap/mp2t.c @@ -157,7 +157,7 @@ mp2t_read_pcr(guint8 *buffer) } static gboolean -mp2t_find_next_pcr(wtap *wth, int *err, gchar **err_info, guint32 *index, guint64 *pcr, guint16 *pid) +mp2t_find_next_pcr(wtap *wth, int *err, gchar **err_info, guint32 *idx, guint64 *pcr, guint16 *pid) { guint8 buffer[MP2T_SIZE]; gboolean found; @@ -165,7 +165,7 @@ mp2t_find_next_pcr(wtap *wth, int *err, gchar **err_info, guint32 *index, guint6 found = FALSE; while (FALSE == found) { - (*index)++; + (*idx)++; if (!wtap_read_bytes(wth->fh, buffer, MP2T_SIZE, err, err_info)) { return FALSE; } @@ -205,7 +205,7 @@ mp2t_bits_per_second(wtap *wth, int *err, gchar **err_info) guint32 pn1, pn2; guint64 pcr1, pcr2; guint16 pid1, pid2; - guint32 index; + guint32 idx; guint64 pcr_delta, bits_passed; /* Find the first PCR + PID. @@ -214,22 +214,22 @@ mp2t_bits_per_second(wtap *wth, int *err, gchar **err_info) * All the different PCRs in different PIDs 'should' be the same. */ - index = 0; + idx = 0; - if (FALSE == mp2t_find_next_pcr(wth, err, err_info, &index, &pcr1, &pid1)) { + if (FALSE == mp2t_find_next_pcr(wth, err, err_info, &idx, &pcr1, &pid1)) { return 0; } - pn1 = index; + pn1 = idx; pn2 = pn1; while (pn1 == pn2) { - if (FALSE == mp2t_find_next_pcr(wth, err, err_info, &index, &pcr2, &pid2)) { + if (FALSE == mp2t_find_next_pcr(wth, err, err_info, &idx, &pcr2, &pid2)) { return 0; } if (pid1 == pid2) { - pn2 = index; + pn2 = idx; } } |