From b292013bdc7ad01357f5d3ee5fbf4990acb63126 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 4 Jun 2018 15:50:34 +0200 Subject: [PATCH] cntraining: Replace proprietary BOOL8 by standard bool data type Add also "static" attribute to local functions and remove an old comment. Signed-off-by: Stefan Weil --- src/training/cntraining.cpp | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/src/training/cntraining.cpp b/src/training/cntraining.cpp index e3949edf..55d520a5 100644 --- a/src/training/cntraining.cpp +++ b/src/training/cntraining.cpp @@ -45,21 +45,11 @@ DECLARE_STRING_PARAM_FLAG(D); Private Function Prototypes ----------------------------------------------------------------------------*/ -void WriteNormProtos(const char *Directory, LIST LabeledProtoList, - const FEATURE_DESC_STRUCT *feature_desc); +static void WriteNormProtos(const char *Directory, LIST LabeledProtoList, + const FEATURE_DESC_STRUCT *feature_desc); -/* -PARAMDESC *ConvertToPARAMDESC( - PARAM_DESC* Param_Desc, - int N); -*/ - -void WriteProtos( - FILE *File, - uint16_t N, - LIST ProtoList, - BOOL8 WriteSigProtos, - BOOL8 WriteInsigProtos); +static void WriteProtos(FILE* File, uint16_t N, LIST ProtoList, + bool WriteSigProtos, bool WriteInsigProtos); /*---------------------------------------------------------------------------- Global Data Definitions and Declarations @@ -216,8 +206,8 @@ int main(int argc, char *argv[]) { * @note Exceptions: none * @note History: Fri Aug 18 16:17:06 1989, DSJ, Created. */ -void WriteNormProtos(const char *Directory, LIST LabeledProtoList, - const FEATURE_DESC_STRUCT *feature_desc) { +static void WriteNormProtos(const char *Directory, LIST LabeledProtoList, + const FEATURE_DESC_STRUCT *feature_desc) { FILE *File; STRING Filename; LABELEDLIST LabeledProto; @@ -254,12 +244,9 @@ void WriteNormProtos(const char *Directory, LIST LabeledProtoList, } // WriteNormProtos /*-------------------------------------------------------------------------*/ -void WriteProtos( - FILE *File, - uint16_t N, - LIST ProtoList, - BOOL8 WriteSigProtos, - BOOL8 WriteInsigProtos) + +static void WriteProtos(FILE* File, uint16_t N, LIST ProtoList, + bool WriteSigProtos, bool WriteInsigProtos) { PROTOTYPE *Proto;