Changeset 7758


Ignore:
Timestamp:
01/31/19 17:49:14 (3 months ago)
Author:
baker
Message:

_LOGITMT is for internal use by logit.c and logit_mt.c only (part 2 of 2)

Location:
trunk/src
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/data_sources/nmxptool/src/Makefile.am

    r7741 r7758  
    2323nodist_nmxptool_SOURCES += @EW_LIBSRC_UTIL@/getutil.c 
    2424nodist_nmxptool_SOURCES += @EW_LIBSRC_UTIL@/logit.c 
     25nodist_nmxptool_SOURCES += @EW_LIBSRC_UTIL@/logit_mt.c 
     26nodist_nmxptool_SOURCES += @EW_LIBSRC_UTIL@/logit_common.c 
    2527nodist_nmxptool_SOURCES += @EW_LIBSRC_UTIL@/socket_ew_common.c 
    2628nodist_nmxptool_SOURCES += @EW_LIBSRC_UTIL@/swap.c 
  • trunk/src/data_sources/nmxptool/src/Makefile.in

    r7756 r7758  
    350350@ENABLE_EWSOURCES_TRUE@ @EW_LIBSRC_UTIL@/getutil.c \ 
    351351@ENABLE_EWSOURCES_TRUE@ @EW_LIBSRC_UTIL@/logit.c \ 
     352@ENABLE_EWSOURCES_TRUE@ @EW_LIBSRC_UTIL@/logit_mt.c \ 
     353@ENABLE_EWSOURCES_TRUE@ @EW_LIBSRC_UTIL@/logit_common.c \ 
    352354@ENABLE_EWSOURCES_TRUE@ @EW_LIBSRC_UTIL@/socket_ew_common.c \ 
    353355@ENABLE_EWSOURCES_TRUE@ @EW_LIBSRC_UTIL@/swap.c \ 
     
    619621@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -c -o nmxptool-getutil.obj `if test -f '@EW_LIBSRC_UTIL@/getutil.c'; then $(CYGPATH_W) '@EW_LIBSRC_UTIL@/getutil.c'; else $(CYGPATH_W) '$(srcdir)/@EW_LIBSRC_UTIL@/getutil.c'; fi` 
    620622 
    621 nmxptool-logit_mt.o: @EW_LIBSRC_UTIL@/logit.c 
    622 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -MT nmxptool-logit_mt.o -MD -MP -MF $(DEPDIR)/nmxptool-logit_mt.Tpo -c -o nmxptool-logit_mt.o `test -f '@EW_LIBSRC_UTIL@/logit.c' || echo '$(srcdir)/'`@EW_LIBSRC_UTIL@/logit.c 
     623nmxptool-logit_mt.o: @EW_LIBSRC_UTIL@/logit_mt.c 
     624@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -MT nmxptool-logit_mt.o -MD -MP -MF $(DEPDIR)/nmxptool-logit_mt.Tpo -c -o nmxptool-logit_mt.o `test -f '@EW_LIBSRC_UTIL@/logit_mt.c' || echo '$(srcdir)/'`@EW_LIBSRC_UTIL@/logit_mt.c 
    623625@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/nmxptool-logit_mt.Tpo $(DEPDIR)/nmxptool-logit_mt.Po 
    624 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='@EW_LIBSRC_UTIL@/logit.c' object='nmxptool-logit_mt.o' libtool=no @AMDEPBACKSLASH@ 
    625 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    626 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -c -o nmxptool-logit_mt.o `test -f '@EW_LIBSRC_UTIL@/logit.c' || echo '$(srcdir)/'`@EW_LIBSRC_UTIL@/logit.c 
    627  
    628 nmxptool-logit_mt.obj: @EW_LIBSRC_UTIL@/logit.c 
    629 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -MT nmxptool-logit_mt.obj -MD -MP -MF $(DEPDIR)/nmxptool-logit_mt.Tpo -c -o nmxptool-logit_mt.obj `if test -f '@EW_LIBSRC_UTIL@/logit.c'; then $(CYGPATH_W) '@EW_LIBSRC_UTIL@/logit.c'; else $(CYGPATH_W) '$(srcdir)/@EW_LIBSRC_UTIL@/logit.c'; fi` 
     626@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='@EW_LIBSRC_UTIL@/logit_mt.c' object='nmxptool-logit_mt.o' libtool=no @AMDEPBACKSLASH@ 
     627@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
     628@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -c -o nmxptool-logit_mt.o `test -f '@EW_LIBSRC_UTIL@/logit_mt.c' || echo '$(srcdir)/'`@EW_LIBSRC_UTIL@/logit_mt.c 
     629 
     630nmxptool-logit_mt.obj: @EW_LIBSRC_UTIL@/logit_mt.c 
     631@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -MT nmxptool-logit_mt.obj -MD -MP -MF $(DEPDIR)/nmxptool-logit_mt.Tpo -c -o nmxptool-logit_mt.obj `if test -f '@EW_LIBSRC_UTIL@/logit_mt.c'; then $(CYGPATH_W) '@EW_LIBSRC_UTIL@/logit_mt.c'; else $(CYGPATH_W) '$(srcdir)/@EW_LIBSRC_UTIL@/logit_mt.c'; fi` 
    630632@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/nmxptool-logit_mt.Tpo $(DEPDIR)/nmxptool-logit_mt.Po 
    631 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='@EW_LIBSRC_UTIL@/logit.c' object='nmxptool-logit_mt.obj' libtool=no @AMDEPBACKSLASH@ 
    632 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    633 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -c -o nmxptool-logit_mt.obj `if test -f '@EW_LIBSRC_UTIL@/logit.c'; then $(CYGPATH_W) '@EW_LIBSRC_UTIL@/logit.c'; else $(CYGPATH_W) '$(srcdir)/@EW_LIBSRC_UTIL@/logit.c'; fi` 
     633@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='@EW_LIBSRC_UTIL@/logit_mt.c' object='nmxptool-logit_mt.obj' libtool=no @AMDEPBACKSLASH@ 
     634@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
     635@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nmxptool_CFLAGS) $(CFLAGS) -c -o nmxptool-logit_mt.obj `if test -f '@EW_LIBSRC_UTIL@/logit_mt.c'; then $(CYGPATH_W) '@EW_LIBSRC_UTIL@/logit_mt.c'; else $(CYGPATH_W) '$(srcdir)/@EW_LIBSRC_UTIL@/logit_mt.c'; fi` 
    634636 
    635637nmxptool-socket_ew_common.o: @EW_LIBSRC_UTIL@/socket_ew_common.c 
  • trunk/src/libsrc/util/logit_common.c

    r7757 r7758  
    11/* 
    2  *   THIS FILE IS UNDER RCS - DO NOT MODIFY UNLESS YOU HAVE 
    3  *   CHECKED IT OUT USING THE COMMAND CHECKOUT. 
    4  * 
    5  *    $Id$ 
    6  * 
    72 *    Revision history: 
    83 *     $Log$ 
     
    8782 */ 
    8883 
    89  
    9084     /************************************************************* 
    91       *                          logit.c                          * 
     85      *                                                           * 
     86      *                      logit_common.c                       * 
     87      *                    (formerly logit.c)                     * 
     88      *                                                           * 
     89      *  logit_common.c is #include'd by logit.c and logit_mt.c   * 
     90      *  to compile either a single-threaded (#ifndef _LOGITMT)   * 
     91      *  or a multi-threaded (#ifdef _LOGITMT) version of the     * 
     92      *  logit functions.  _LOGITMT is for internal use only and  * 
     93      *  should not be defined anywhere else.                     * 
     94      *                                                           * 
    9295      *                                                           * 
    9396      *            Functions for maintaining log files.           * 
     
    108111      *                                                           * 
    109112      *************************************************************/ 
     113 
    110114/* 
    111115 * 8/17/2001 Changed log file names to the format: programname_date.log. 
     
    146150 */ 
    147151 
     152#include <stdarg.h> 
    148153#include <stdio.h> 
    149154#include <stdlib.h> 
    150155#include <string.h> 
    151 #include <stdarg.h> 
    152156#include <time.h> 
    153 #include <time_ew.h> 
    154 #include <kom.h> 
    155  
    156 #ifndef EARTHWORM_H 
    157 #include <earthworm.h> 
    158 #endif 
     157 
     158#include "earthworm.h" 
     159#include "kom.h" 
     160#include "time_ew.h" 
    159161 
    160162/* set this for Linux */ 
     
    245247            (res.tm_mon + 1), res.tm_mday); 
    246248 
    247  
    248249/* If we are writing to a disk file... 
    249250   ***********************************/ 
    250251   if ( disk ) 
    251252   { 
    252  
    253253 
    254254/* See if the date has changed. 
     
    458458    *   The rest of calling sequence is identical to printf.                * 
    459459    *************************************************************************/ 
     460 
    460461void logit_for_kom( char *message ) { 
    461462    logit("et","%s", message); 
     
    633634   strcpy( date_prev, date ); 
    634635 
    635  
    636636#if EW_DEBUG 
    637637 fprintf (stderr, "Opening %s\n", logName); 
     
    690690   return; 
    691691} 
    692  
    693692 
    694693   /***************************************************************** 
     
    731730 *                                                                       * 
    732731 *************************************************************************/ 
     732 
    733733int get_prog_name2( const char *szFullName, char * szProgName, int iProgNameBufferLen ) 
    734734{ 
     
    766766 
    767767} 
    768  
    769768 
    770769/************************************************************************* 
     
    781780 *                                                                       * 
    782781 *************************************************************************/ 
     782 
    783783int get_prog_name( const char *full_name, char *prog_name ) 
    784784{ 
     
    808808 
    809809} 
    810  
    811  
    812810 
    813811   /***************************************************************** 
     
    878876            (res.tm_mon + 1), res.tm_mday); 
    879877 
    880  
    881878/* If we are writing to a disk file... 
    882879   ***********************************/ 
    883880   if ( disk ) 
    884881   { 
    885  
    886882 
    887883/* See if the date has changed. 
  • trunk/src/libsrc/util/makefile.nt

    r7753 r7758  
    8787        copy *.obj $L 
    8888 
    89 logit_mt.obj: logit.c 
    90         $(cc) $(CFLAGS) /D_LOGITMT /Fo$@ logit.c 
    91  
    9289gd_lib: PHONY 
    9390        cd gd_lib  & nmake -f makefile.nt & cd .. 
  • trunk/src/libsrc/util/makefile.unix

    r7753 r7758  
    3636        lockfile.c \ 
    3737        logit.c \ 
     38        logit_mt.c \ 
    3839        make_triglist.c\ 
    3940        mem_circ_queue.c\ 
     
    8485SPECIFIC_SRCS   = $($(PLATFORM)_SOURCES) 
    8586 
    86 OBJS = $(SPECIFIC_SRCS:%.c=%.o) logit_mt.o 
     87OBJS = $(SPECIFIC_SRCS:%.c=%.o) 
    8788 
    8889all: $(OBJS) gd_lib libmseed signing 
    8990        cp *.o $L 
    90  
    91 logit_mt.o: logit.c 
    92         $(CC) -c $(CFLAGS) -D_LOGITMT -o $@ $< 
    9391 
    9492startstop_unix_generic.o: startstop_unix_generic.c $I/startstop_unix_generic.h 
  • trunk/src/libsrc_cpp/servers/template/makefile.nt

    r7739 r7758  
    157157 
    158158 
    159 SOURCE=$(EW_HOME)\$(EW_VERSION)\src\libsrc\util\logit.c 
     159SOURCE=$(EW_HOME)\$(EW_VERSION)\src\libsrc\util\logit_mt.c 
    160160 
    161161"$(INTDIR)\logit_mt.obj" : $(SOURCE) "$(INTDIR)" 
Note: See TracChangeset for help on using the changeset viewer.