Diff: eth.cpp

Revision:

125:8ff4dc96ad58

Parent:

124:c1b6c893e1c3

Child:

132:05cd37f7e007

diff -r c1b6c893e1c3 -r 8ff4dc96ad58 eth.cpp
--- a/eth.cpp	Wed May 13 14:25:57 2015 +0000
+++ b/eth.cpp	Wed May 13 21:18:12 2015 +0000
@@ -77,12 +77,13 @@
     char buff_msk[ 16 ] = "";
     char buff_gtw[ 16 ] = "";
     if( debug_uart3 ) pc.printf("\n\r");
-    FILE *fp = fopen( "/qspi/myip.txt", "r");
-    if( fp == NULL ){
+    
+    FILE * fip = fopen( "/qspi/myip.txt", "r");
+    if( fip == NULL ){
         if( debug_file ) debug_msg("Failed to open /qspi/myip.txt" );
         strncpy( buff_ip, MY_IP, 20 );    
     }else{
-        int read = fread( buff_ip, 1, 512, fp );
+        int read = fread( buff_ip, 1, 512, fip );
         if( read > 0 ){
             for( int i = 0; i < read; i++ ) 
                 if( buff_ip[ i ] == '\n' || buff_ip[ i ] == '\r' ){
@@ -95,14 +96,15 @@
             strncpy( buff_ip, MY_IP, 20 );
         }
     }
-    fclose( fp );
-    buff_ip[ 15 ] = 0;
-    fp = fopen( "/qspi/mymask.txt", "r");
-    if( fp == NULL ){
+    if ( fip ) fclose( fip );
+    buff_ip [ 15 ] = 0;
+    
+    FILE * fmask = fopen( "/qspi/mymask.txt", "r");
+    if( fmask == NULL ){
         if( debug_file ) debug_msg("Failed to open /qspi/mymask.txt" );
         strncpy( buff_msk, MY_MSK, 20 );    
     }else{
-        int read = fread( buff_msk, 1, 512, fp );
+        int read = fread( buff_msk, 1, 512, fmask );
         if( read > 0 ){
             for( int i = 0; i < read; i++ ) 
                 if( buff_msk[ i ] == '\n' || buff_msk[ i ] == '\r' ){
@@ -115,14 +117,15 @@
             strncpy( buff_msk, MY_MSK, 20 );
         }
     }
-    fclose( fp );
-    buff_msk[ 15 ] = 0;
-    fp = fopen( "/qspi/mygateway.txt", "r");
-    if( fp == NULL ){
+    if ( fmask ) fclose ( fmask );
+    buff_msk [ 15 ] = 0;
+    
+    FILE * fgate = fopen( "/qspi/mygateway.txt", "r");
+    if( fgate == NULL ){
         if( debug_file ) debug_msg("Failed to open /qspi/mygateway.txt" );
         strncpy( buff_gtw, MY_GTW, 20 );    
     }else{
-        int read = fread( buff_gtw, 1, 512, fp );
+        int read = fread( buff_gtw, 1, 512, fgate );
         if( read > 0 ){
             for( int i = 0; i < read; i++ ) 
                 if( buff_gtw[ i ] == '\n' || buff_gtw[ i ] == '\r' ){
@@ -135,8 +138,8 @@
             strncpy( buff_gtw, MY_GTW, 20 );
         }
     }
-    fclose( fp );
-    buff_gtw[ 15 ] = 0;
+    if ( fgate ) fclose( fgate );
+    buff_gtw [ 15 ] = 0;
     
     if( !initialized ){
         //eth.init( buff_ip, buff_msk, buff_gtw );