Changeset 6624 for nanoscale

Timestamp:

Nov 14, 2016 1:18:06 PM (7 years ago)

Author:

ldelgass

Message:

Some minor cleanups to sync with 1.0 branch

Location:

nanoscale/trunk

Files:

• Makefile.in (modified) (4 diffs)
• server.c (modified) (2 diffs)

nanoscale/trunk/Makefile.in

@@ -1 @@
-USE_TCL_CONFIG  = #yes
-WANT_TRACE      = #yes
+USE_TCL_CONFIG  = #yes
+WANT_TRACE      = #yes
 
 CC              = @CC@
@@ -28 +28 @@
 SERVER_OBJS     = server.o
 ifdef USE_TCL_CONFIG
-SERVER_OBJS    += tclparser.o
+SERVER_OBJS     += tclparser.o
 else
-SERVER_OBJS    += configparser.o
+SERVER_OBJS     += configparser.o
 endif
 CLIENT_OBJS     = client.o clientlib.o
@@ -41 +41 @@
 
 ifdef WANT_TRACE
-DEFINES         = -DWANT_TRACE
+DEFINES         = -DWANT_TRACE
 endif
 ifdef USE_TCL_CONFIG
-CONFIGFILE      = renderservers.tcl
-DEFINES         = -DTCL_CONFIG
+CONFIGFILE      = renderservers.tcl
+DEFINES         = -DTCL_CONFIG
 else
-CONFIGFILE      = renderservers.cfg
-DEFINES         =
+CONFIGFILE      = renderservers.cfg
+DEFINES         =
 endif
 DEFINES         += -DSERVERSFILE=\"$(libdir)/$(CONFIGFILE)\" \
@@ -55 +55 @@
 INCLUDES        = -I.
 ifdef USE_TCL_CONFIG
-INCLUDES       += $(TCL_INC_SPEC)
+INCLUDES        += $(TCL_INC_SPEC)
 endif
 ifdef USE_TCL_CONFIG
-LIBS            = $(TCL_LIB_SPEC) -Wl,-rpath,$(LD_RUN_PATH)
+LIBS            = $(TCL_LIB_SPEC) -Wl,-rpath,$(LD_RUN_PATH)
 else
-LIBS            =
+LIBS            =
 endif
 

nanoscale/trunk/server.c

@@ -20 +20 @@
 #include <sys/stat.h>
 #include <sys/file.h>
+#include <syslog.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -82 +83 @@
     if (serverPid != getpid()) {
         length = snprintf(message, MSG_LEN, "(%d) %s: %s:%d ",
-                          serverPid, syslogLevels[priority],  s, lineNum);
+                          serverPid, syslogLevels[priority], s, lineNum);
     } else {
         length = snprintf(message, MSG_LEN, "%s: %s:%d ",
-                          syslogLevels[priority],  s, lineNum);
+                          syslogLevels[priority], s, lineNum);
     }
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);