osaf/services/saf/logsv/lgs/lgs_fmt.c | 27 +++++++++++++++++++++++++--
osaf/services/saf/logsv/lgs/lgs_fmt.h | 4 ++++
2 files changed, 29 insertions(+), 2 deletions(-)
- Changes meaning of @Cd from day name to day number
- Adds new token @CD for day name
diff --git a/osaf/services/saf/logsv/lgs/lgs_fmt.c
b/osaf/services/saf/logsv/lgs/lgs_fmt.c
--- a/osaf/services/saf/logsv/lgs/lgs_fmt.c
+++ b/osaf/services/saf/logsv/lgs/lgs_fmt.c
@@ -154,6 +154,15 @@ static SaBoolT validateComToken(SaString
}
break;
+ case C_TIME_STAMP_DAYN_LETTER:
+ shiftOffset = (int)C_TIME_STAMP_DAYN_SHIFT_OFFSET;
+ if ((SaBoolT)((*tokenFlags >> shiftOffset) & 1) == SA_TRUE) {
+ tokenOk = SA_FALSE; /* Same token used two times */
+ } else {
+ *tokenFlags = (*tokenFlags | (1 << shiftOffset));
+ }
+ break;
+
case C_TIME_STAMP_YEAR_LETTER:
shiftOffset = (int)C_TIME_STAMP_YEAR_SHIFT_OFFSET;
if ((SaBoolT)((*tokenFlags >> shiftOffset) & 1) == SA_TRUE) {
@@ -332,6 +341,15 @@ static SaBoolT validateNtfToken(SaString
}
break;
+ case N_EVENT_TIME_DAYN_LETTER:
+ shiftOffset = (int)N_EVENT_TIME_DAYN_SHIFT_OFFSET;
+ if ((SaBoolT)((*tokenFlags >> shiftOffset) & 1) == SA_TRUE) {
+ tokenOk = SA_FALSE; /* Same token used two times */
+ } else {
+ *tokenFlags = (*tokenFlags | (1 << shiftOffset));
+ }
+ break;
+
case N_EVENT_TIME_YEAR_LETTER:
shiftOffset = (int)N_EVENT_TIME_YEAR_SHIFT_OFFSET;
if ((SaBoolT)((*tokenFlags >> shiftOffset) & 1) == SA_TRUE) {
@@ -583,8 +601,13 @@ static int extractCommonField(char *dest
}
break;
+
+ case C_TIME_STAMP_DAY_LETTER:
+ stringSize = 3 * sizeof(char);
+ characters = snprintf(dest, dest_size, "%02d",
(timeStampData->tm_mday));
+ break;
- case C_TIME_STAMP_DAY_LETTER:
+ case C_TIME_STAMP_DAYN_LETTER:
stringSize = 3 * sizeof(char);
switch (timeStampData->tm_wday) {
case DAY_SUNDAY:
@@ -843,7 +866,7 @@ static int extractNotificationField(char
}
break;
- case N_EVENT_TIME_DAY_LETTER:
+ case N_EVENT_TIME_DAYN_LETTER:
switch (eventTimeData->tm_wday) {
case DAY_SUNDAY:
characters = snprintf(dest, dest_size, "Sun");
diff --git a/osaf/services/saf/logsv/lgs/lgs_fmt.h
b/osaf/services/saf/logsv/lgs/lgs_fmt.h
--- a/osaf/services/saf/logsv/lgs/lgs_fmt.h
+++ b/osaf/services/saf/logsv/lgs/lgs_fmt.h
@@ -46,6 +46,7 @@ typedef enum {
C_TIME_STAMP_MONTH_SHIFT_OFFSET,
C_TIME_STAMP_MON_SHIFT_OFFSET,
C_TIME_STAMP_DAY_SHIFT_OFFSET,
+ C_TIME_STAMP_DAYN_SHIFT_OFFSET,
C_TIME_STAMP_YEAR_SHIFT_OFFSET,
C_TIME_STAMP_FULL_YEAR_SHIFT_OFFSET,
C_NOTIFICATION_CLASS_ID_SHIFT_OFFSET,
@@ -64,6 +65,7 @@ typedef enum {
N_EVENT_TIME_MONTH_SHIFT_OFFSET,
N_EVENT_TIME_MON_SHIFT_OFFSET,
N_EVENT_TIME_DAY_SHIFT_OFFSET,
+ N_EVENT_TIME_DAYN_SHIFT_OFFSET,
N_EVENT_TIME_YEAR_SHIFT_OFFSET,
N_EVENT_TIME_FULL_YEAR_SHIFT_OFFSET,
N_EVENT_TYPE_SHIFT_OFFSET,
@@ -86,6 +88,7 @@ typedef enum {
C_TIME_STAMP_MONTH_LETTER = 'm',
C_TIME_STAMP_MON_LETTER = 'M',
C_TIME_STAMP_DAY_LETTER = 'd',
+ C_TIME_STAMP_DAYN_LETTER = 'D',
C_TIME_STAMP_YEAR_LETTER = 'y',
C_TIME_STAMP_FULL_YEAR_LETTER = 'Y',
C_NOTIFICATION_CLASS_ID_LETTER = 'c',
@@ -104,6 +107,7 @@ typedef enum {
N_EVENT_TIME_MONTH_LETTER = 'm',
N_EVENT_TIME_MON_LETTER = 'M',
N_EVENT_TIME_DAY_LETTER = 'd',
+ N_EVENT_TIME_DAYN_LETTER = 'D',
N_EVENT_TIME_YEAR_LETTER = 'y',
N_EVENT_TIME_FULL_YEAR_LETTER = 'Y',
N_EVENT_TYPE_LETTER = 'e',
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
