Ignore:
Timestamp:
Jul 18, 2015, 5:06:52 PM (6 years ago)
Author:
katerina
Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/sh_portcheck.c

    r473 r481  
    529529 * by longjmp' warning. And no, 'volatile' proved insufficient.
    530530 */
    531 static void * sh_dummy_pre = NULL;
    532 static void * sh_dummy_ptr = NULL;
     531void * sh_dummy_531_pre = NULL;
     532void * sh_dummy_532_ptr = NULL;
    533533
    534534/* check the list of open ports for any that are marked as UNKN
    535535 */
    536 static void sh_portchk_check_list (struct sh_portentry ** head, int proto, int report)
     536static void sh_portchk_check_list (struct sh_portentry ** head,
     537                                   int proto, int report)
    537538{
    538539  struct sh_portentry * ptr = *head;
     
    543544   * Avoids the 'clobbered by longjmp' warning.
    544545   */
    545   sh_dummy_pre = (void*) ⪯
    546   sh_dummy_ptr = (void*) &ptr;
     546  sh_dummy_531_pre = (void*) ⪯
     547  sh_dummy_532_ptr = (void*) &ptr;
    547548 
    548549  while (ptr)
     
    616617    }
    617618
    618   sh_dummy_ptr = NULL;
    619   sh_dummy_pre = NULL;
     619  sh_dummy_532_ptr = NULL;
     620  sh_dummy_531_pre = NULL;
    620621
    621622  return;
     
    15611562/* Subroutine to add an interface
    15621563 */
    1563 static void * sh_dummy_str    = NULL; /* fix clobbered by.. warning */
     1564void * sh_dummy_1564_str    = NULL; /* fix clobbered by.. warning */
    15641565
    15651566static int sh_portchk_add_interface (const char * str)
     
    15691570  char buf[64];
    15701571
    1571   sh_dummy_str    = (void*) &str;
     1572  sh_dummy_1564_str    = (void*) &str;
    15721573
    15731574  if (iface_initialized == 0)
     
    16101611  } while (*str);
    16111612
    1612   sh_dummy_str = NULL;
     1613  sh_dummy_1564_str = NULL;
    16131614  return 0;
    16141615}
Note: See TracChangeset for help on using the changeset viewer.