Просмотр исходного кода

apps/netbiosns: Convert to use lwip_isupper instead of open-coded

Also remove additonal (cname == '\0' || cname == '.') check because
it's covered by !lwip_isupper(cname) test.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Axel Lin 7 лет назад
Родитель
Сommit
9b638e7c05
1 измененных файлов с 2 добавлено и 7 удалено
  1. 2 7
      src/apps/netbiosns/netbiosns.c

+ 2 - 7
src/apps/netbiosns/netbiosns.c

@@ -245,7 +245,7 @@ netbiosns_name_decode(char *name_enc, char *name_dec, int name_dec_len)
     if (cname == '.') {
       break;  /* scope ID follows */
     }
-    if (cname < 'A' || cname > 'Z') {
+    if (!lwip_isupper(cname)) {
       /* Not legal. */
       return -1;
     }
@@ -254,12 +254,7 @@ netbiosns_name_decode(char *name_enc, char *name_dec, int name_dec_len)
     pname++;
 
     cname = *pname;
-    if (cname == '\0' || cname == '.') {
-      /* No more characters in the name - but we're in
-       * the middle of a pair.  Not legal. */
-      return -1;
-    }
-    if (cname < 'A' || cname > 'Z') {
+    if (!lwip_isupper(cname)) {
       /* Not legal. */
       return -1;
     }