Wireshark-commits: [Wireshark-commits] master a6bd22d: gsm_sim: fix conflict
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 26 May 2019 06:34:29 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a6bd22dfa6c9a6fed05ef043f3ed262abcf7b722
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

a6bd22d by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    gsm_sim: fix conflict
    
    'gsm_sim.apdu.cla.secure_messaging_ind' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    
    Change-Id: Iff6e05d5e2c1309a62e026099bc90f8cb8a9b803
    Reviewed-on: https://code.wireshark.org/review/33352
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  0ab91dd   wslua: print the correct type for FT_NONE dissector tables
     add  a6bd22d   gsm_sim: fix conflict


Summary of changes:
 epan/dissectors/packet-gsm_sim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)