syntax cleanup
authorArt Cancro <ajc@citadel.org>
Sun, 11 Jun 2017 03:40:49 +0000 (23:40 -0400)
committerArt Cancro <ajc@citadel.org>
Sun, 11 Jun 2017 03:40:49 +0000 (23:40 -0400)
citadel/config.c
citadel/modules/inetcfg/serv_inetcfg.c

index 9cc1b3a3db3a9f203425614dfe618015e44135a4..76a342c7a4c4a2473fd5940586928a04fee1248e 100644 (file)
@@ -486,8 +486,7 @@ char *CtdlGetSysConfig(char *sysconfname) {
        /* We want the last (and probably only) config in this room */
        begin_critical_section(S_CONFIG);
        config_msgnum = (-1L);
-       CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL,
-                          CtdlGetSysConfigBackend, NULL);
+       CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL, CtdlGetSysConfigBackend, NULL);
        msgnum = config_msgnum;
        end_critical_section(S_CONFIG);
 
@@ -507,10 +506,12 @@ char *CtdlGetSysConfig(char *sysconfname) {
 
        CtdlGetRoom(&CC->room, hold_rm);
 
-       if (conf != NULL) do {
+       if (conf != NULL) {
+               do {
                        extract_token(buf, conf, 0, '\n', sizeof buf);
                        strcpy(conf, &conf[strlen(buf)+1]);
                } while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) );
+       }
 
        return(conf);
 }
index 46971ae91220408303a4cae1ff59a013e398a6c2..990302f92d9cc78172d27acda6e75d1f8e97f059 100644 (file)
@@ -100,8 +100,7 @@ int inetcfg_aftersave(struct CtdlMessage *msg, recptypes *recp) {
                }
                
                if (!strncasecmp(ptr, "Content-type: ", 14)) {
-                       if (!strncasecmp(&ptr[14], INTERNETCFG,
-                          strlen(INTERNETCFG))) {
+                       if (!strncasecmp(&ptr[14], INTERNETCFG, strlen(INTERNETCFG))) {
                                inetcfg_setTo(msg);     /* changing configs */
                        }
                }