소스 검색

Merge branch 'master' of github.com:EIPStackGroup/OpENer

Martin Melik Merkumians 5 년 전
부모
커밋
45dc0e9148
1개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 4
      source/src/ports/POSIX/networkconfig.c

+ 3 - 4
source/src/ports/POSIX/networkconfig.c

@@ -198,13 +198,11 @@ static EipStatus GetDnsInfoFromResolvConf
   char *value_string;
   char *value_string;
   char *strtok_save;
   char *strtok_save;
   char *strtok_key;
   char *strtok_key;
-  char *line;
   CipUdint dmy_dns;
   CipUdint dmy_dns;
   CipUdint *dns = &iface_cfg->name_server;
   CipUdint *dns = &iface_cfg->name_server;
   /* Split the file_buffer into lines. */
   /* Split the file_buffer into lines. */
-  for (char *strtok_beg = file_buffer;
-       NULL != (line = strtok_r(strtok_beg, "\n", &strtok_save) );
-       strtok_beg = NULL)
+  char *line = strtok_r(file_buffer, "\n", &strtok_save);
+  while (NULL != line)
   {
   {
     /* Inspect each line for keywords: search, domain, nameserver */
     /* Inspect each line for keywords: search, domain, nameserver */
     switch (line[0]) {
     switch (line[0]) {
@@ -245,6 +243,7 @@ static EipStatus GetDnsInfoFromResolvConf
         }
         }
         break;
         break;
     }
     }
+    line = strtok_r(NULL, "\n", &strtok_save);
   }
   }
   free(file_buffer);
   free(file_buffer);
   return kEipStatusOk;
   return kEipStatusOk;