From 1d0dcf017124327f914834204ce7ef828b62a62b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 1 Mar 2012 11:31:32 -0600 Subject: [PATCH] libCom: Deleted the 3.13 tsDefs API. --- documentation/RELEASE_NOTES.html | 8 +++++ src/libCom/Makefile | 1 - src/libCom/tsDefs/Makefile | 13 --------- src/libCom/tsDefs/README | 6 ---- src/libCom/tsDefs/tsDefs.c | 36 ----------------------- src/libCom/tsDefs/tsDefs.h | 50 -------------------------------- 6 files changed, 8 insertions(+), 106 deletions(-) delete mode 100644 src/libCom/tsDefs/Makefile delete mode 100644 src/libCom/tsDefs/README delete mode 100644 src/libCom/tsDefs/tsDefs.c delete mode 100644 src/libCom/tsDefs/tsDefs.h diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html index 9cd899604..f5e120de5 100644 --- a/documentation/RELEASE_NOTES.html +++ b/documentation/RELEASE_NOTES.html @@ -15,6 +15,14 @@ EPICS Base 3.15.0.x releases are not intended for use in production systems.

Changes between 3.14.x and 3.15.0.x

+

+Removed tsDefs.h

+ +

+The deprecated tsDefs API was provided for 3.13 compatibility only, and has now +been removed. Convert any remaining code that used it to call the epicsTime API +instead.

+

Changes to epicsVersion.h

diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 676a805ec..349c8dd26 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -34,7 +34,6 @@ include $(LIBCOM)/osi/Makefile include $(LIBCOM)/ring/Makefile include $(LIBCOM)/taskwd/Makefile include $(LIBCOM)/timer/Makefile -include $(LIBCOM)/tsDefs/Makefile include $(LIBCOM)/yacc/Makefile # Library to build: diff --git a/src/libCom/tsDefs/Makefile b/src/libCom/tsDefs/Makefile deleted file mode 100644 index 62420e138..000000000 --- a/src/libCom/tsDefs/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -#************************************************************************* -# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne -# National Laboratory. -# EPICS BASE is distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* - -# This is a Makefile fragment, see src/libCom/Makefile. - -#tsDefs contains R3.13 compatibility tsStamp code -SRC_DIRS += $(LIBCOM)/tsDefs -INC += tsDefs.h -Com_SRCS += tsDefs.c diff --git a/src/libCom/tsDefs/README b/src/libCom/tsDefs/README deleted file mode 100644 index fddac4575..000000000 --- a/src/libCom/tsDefs/README +++ /dev/null @@ -1,6 +0,0 @@ -This directory contains the old R3.13 -time stamp definitions and routines -needed by epics extensions. They exist -for compatibility purposes only and -should not be used by new code. - diff --git a/src/libCom/tsDefs/tsDefs.c b/src/libCom/tsDefs/tsDefs.c deleted file mode 100644 index 22fdbe6ed..000000000 --- a/src/libCom/tsDefs/tsDefs.c +++ /dev/null @@ -1,36 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* - * $Revision-Id$ - */ - -#define epicsExportSharedSymbols -#include "tsDefs.h" - -epicsShareFunc char * epicsShareAPI tsStampToText(const TS_STAMP *pTS,enum tsTextType textType,char *textBuffer) -{ - switch (textType) { - case TS_TEXT_MMDDYY: - epicsTimeToStrftime(textBuffer,28,"%m/%d/%y %H:%M:%S.%09f",pTS); - break; - case TS_TEXT_MONDDYYYY: - epicsTimeToStrftime(textBuffer,32,"%b %d, %Y %H:%M:%S.%09f",pTS); - break; - default: - return NULL; - } - return textBuffer; -} - -epicsShareFunc long epicsShareAPI tsLocalTime(TS_STAMP *pStamp) -{ - return epicsTimeGetCurrent(pStamp); -} - diff --git a/src/libCom/tsDefs/tsDefs.h b/src/libCom/tsDefs/tsDefs.h deleted file mode 100644 index 00f48feae..000000000 --- a/src/libCom/tsDefs/tsDefs.h +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* - * $Revision-Id$ - * This file contains the old R3.13 - * time stamp definitions and routines - * needed by epics extensions. They exist - * for compatibility purposes only and - * should not be used by new code. - * - */ -#ifndef tsDefsh -#define tsDefsh - -#include "epicsTime.h" -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/*---------------------------------------------------------------------------- -* TS_TEXT_xxx text type codes for converting between text and time stamp -* -* TS_TEXT_MONDDYYYY Mon dd, yyyy hh:mm:ss.nano-secs -* TS_TEXT_MMDDYY mm/dd/yy hh:mm:ss.nano-secs -* 123456789012345678901234567890123456789 -* 0 1 2 3 -*----------------------------------------------------------------------------*/ -enum tsTextType{ - TS_TEXT_MONDDYYYY, - TS_TEXT_MMDDYY -}; - -epicsShareFunc char * epicsShareAPI tsStampToText(const TS_STAMP *pTS,enum tsTextType textType,char *textBuffer); -epicsShareFunc long epicsShareAPI tsLocalTime(TS_STAMP *pStamp); - -#ifdef __cplusplus -} -#endif -#endif /* tsDefsh */ - -