X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fnetconf.c;h=a426217114c97cd6dbae6527f88e7f384e9c3ae2;hp=8683879ffc2bbd74873bda4caad4855a7a21d508;hb=92d54d5413cc630032e81c9680f5e5089c9edbcc;hpb=a61b1089288f722a9ed5bfa429f10fd7e478675f diff --git a/webcit/netconf.c b/webcit/netconf.c index 8683879ff..a42621711 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -88,14 +88,13 @@ HashList *load_netconf(StrBuf *Target, WCTemplputParams *TP) Hash = NewHash(1, NULL); Buf = NewStrBuf(); - while ((len = StrBuf_ServGetln(Buf), - (len != 3) || !strcmp(ChrPtr(Buf), "000"))) { + while (len = StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) { Node = NewNode(Buf); - if (Node == NULL) - continue; - nUsed = GetCount(Hash); - nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1); - Put(Hash, nnn, nUsed, Node, DeleteNodeConf); + if (Node != NULL) { + nUsed = GetCount(Hash); + nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1); + Put(Hash, nnn, nUsed, Node, DeleteNodeConf); + } } FreeStrBuf(&Buf); return Hash;