Changeset 36472


Ignore:
Timestamp:
2013-04-28T16:05:57+02:00 (5 years ago)
Author:
jow
Message:

AA: iwinfo: merge r36471

Location:
branches/attitude_adjustment/package/iwinfo
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/attitude_adjustment/package/iwinfo/Makefile

    r36465 r36472  
    88 
    99PKG_NAME:=libiwinfo 
    10 PKG_RELEASE:=43 
     10PKG_RELEASE:=44 
    1111 
    1212PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 
  • branches/attitude_adjustment/package/iwinfo/src/iwinfo_utils.c

    r36465 r36472  
    132132        FILE *db; 
    133133        char buf[256] = { 0 }; 
    134         static struct iwinfo_hardware_entry e; 
     134        static struct iwinfo_hardware_entry e, *rv = NULL; 
    135135 
    136136        if (!(db = fopen(IWINFO_HARDWARE_FILE, "r"))) 
     
    162162                        continue; 
    163163 
     164                rv = &e; 
    164165                break; 
    165166        } 
    166167 
    167168        fclose(db); 
    168  
    169         if (e.device_name[0]) 
    170                 return &e; 
    171  
    172         return NULL; 
     169        return rv; 
    173170} 
    174171 
Note: See TracChangeset for help on using the changeset viewer.