RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- removed redundant declarations (LIB61850-359)

Browse Source
pull/415/head
Michael Zillgith 3 years ago
parent 4b5db538fd
commit 98f088a1d3
23 changed files with 16 additions and 86 deletions
Show Stats Download Patch File Download Diff File

7
CMakeLists.txt
Unescape Escape View File

@ -137,6 +137,13 @@ add_definitions(-DCONFIG_MMS_SUPPORT_TLS=1)
endif(WITH_MBEDTLS)
include(CheckCCompilerFlag)
check_c_compiler_flag("-Wredundant-decls" SUPPORT_REDUNDANT_DECLS)
if (SUPPORT_REDUNDANT_DECLS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls")
endif(SUPPORT_REDUNDANT_DECLS)
# write the detected stuff to this file
configure_file(
${CMAKE_CURRENT_LIST_DIR}/config/stack_config.h.cmake

3
examples/iec61850_9_2_LE_example/iec61850_9_2_LE_example.c
Unescape Escape View File

@ -34,9 +34,6 @@
/* Include the generated header with the model access handles */
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static int svcbEnabled = 1;

3
examples/server_example_61400_25/server_example_61400_25.c
Unescape Escape View File

@ -29,9 +29,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static IedServer iedServer;
static int running = 0;

3
examples/server_example_basic_io/server_example_basic_io.c
Unescape Escape View File

@ -15,9 +15,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_complex_array/server_example_ca.c
Unescape Escape View File

@ -14,9 +14,6 @@
#include <assert.h>
/* import IEC 61850 device model created from ICD-File */
extern IedModel iedModel;
static int running = 0;
static void

3
examples/server_example_control/server_example_control.c
Unescape Escape View File

@ -12,9 +12,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_deadband/server_example_deadband.c
Unescape Escape View File

@ -15,9 +15,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_files/server_example_files.c
Unescape Escape View File

@ -14,9 +14,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_goose/server_example_goose.c
Unescape Escape View File

@ -14,9 +14,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_logging/server_example_logging.c
Unescape Escape View File

@ -20,9 +20,6 @@
LogStorage
SqliteLogStorage_createInstance(const char* filename);
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

5
examples/server_example_password_auth/server_example_password_auth.c
Unescape Escape View File

@ -19,10 +19,7 @@
#include <signal.h>
#include <stdlib.h>
#include <stdio.h>
#include "../server_example_password_auth/static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
#include "static_model.h"
static int running = 0;

3
examples/server_example_service_tracking/server_example_service_tracking.c
Unescape Escape View File

@ -13,9 +13,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_setting_groups/server_example_sg.c
Unescape Escape View File

@ -12,9 +12,6 @@
/* Include the generated header with the model access handles */
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static IedServer iedServer;
static int running = 0;

3
examples/server_example_simple/server_example_simple.c
Unescape Escape View File

@ -29,9 +29,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
void

3
examples/server_example_substitution/server_example_substitution.c
Unescape Escape View File

@ -17,9 +17,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_threadless/server_example_threadless.c
Unescape Escape View File

@ -13,9 +13,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/server_example_write_handler/server_example_write_handler.c
Unescape Escape View File

@ -10,9 +10,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

3
examples/tls_server_example/tls_server_example.c
Unescape Escape View File

@ -13,9 +13,6 @@
#include "static_model.h"
/* import IEC 61850 device model created from SCL-File */
extern IedModel iedModel;
static int running = 0;
static IedServer iedServer = NULL;

14
src/iec61850/inc_private/ied_connection_private.h
Unescape Escape View File

@ -1,7 +1,7 @@
/*
* ied_connection_private.h
*
* Copyright 2013-2018 Michael Zillgith
* Copyright 2013-2022 Michael Zillgith
*
* This file is part of libIEC61850.
*
@ -145,16 +145,4 @@ controlObjectClient_invokeCommandTerminationHandler(ControlObjectClient self);
LIB61850_INTERNAL void
ControlObjectClient_setLastApplError(ControlObjectClient self, LastApplError lastAppIError);
/* some declarations that are shared with server side ! */
LIB61850_INTERNAL char*
MmsMapping_createMmsVariableNameFromObjectReference(const char* objectReference, FunctionalConstraint fc, char* buffer);
LIB61850_INTERNAL char*
MmsMapping_varAccessSpecToObjectReference(MmsVariableAccessSpecification* varAccessSpec);
LIB61850_INTERNAL MmsVariableAccessSpecification*
MmsMapping_ObjectReferenceToVariableAccessSpec(char* objectReference);
#endif /* IED_CONNECTION_PRIVATE_H_ */

4
src/iec61850/server/mms_mapping/mms_mapping.c
Unescape Escape View File

@ -69,12 +69,10 @@ typedef struct
} SettingGroup;
#if (CONFIG_IEC61850_CONTROL_SERVICE == 1)
MmsValue*
Control_readAccessControlObject(MmsMapping* self, MmsDomain* domain, char* variableIdOrig,
MmsServerConnection connection, bool isDirectAccess);
bool
ControlObject_unselect(ControlObject* self, MmsServerConnection connection, MmsMapping* mmsMapping);
#endif
void /* Create PHYCOMADDR ACSI type instance */

13
src/mms/inc/mms_client_connection.h
Unescape Escape View File

@ -1036,6 +1036,11 @@ LIB61850_API void
MmsConnection_identifyAsync(MmsConnection self, uint32_t* usedInvokeId, MmsError* mmsError,
MmsConnection_IdentifyHandler handler, void* parameter);
/**
* \brief Destroy (free) an MmsServerIdentity object
*
* \param self the object to destroy
*/
LIB61850_API void
MmsServerIdentity_destroy(MmsServerIdentity* self);
@ -1285,14 +1290,6 @@ LIB61850_API void
MmsConnection_readJournalStartAfterAsync(MmsConnection self, uint32_t* usedInvokeId, MmsError* mmsError, const char* domainId, const char* itemId,
MmsValue* timeSpecification, MmsValue* entrySpecification, MmsConnection_ReadJournalHandler handler, void* parameter);
/**
* \brief Destroy (free) an MmsServerIdentity object
*
* \param self the object to destroy
*/
LIB61850_API void
MmsServerIdentity_destroy(MmsServerIdentity* self);
/**@}*/
#ifdef __cplusplus

3
src/mms/inc_private/ber_encoder.h
Unescape Escape View File

@ -64,9 +64,6 @@ BerEncoder_encodeUInt32WithTL(uint8_t tag, uint32_t value, uint8_t* buffer, int
LIB61850_INTERNAL int
BerEncoder_encodeBitString(uint8_t tag, int bitStringSize, uint8_t* bitString, uint8_t* buffer, int bufPos);
LIB61850_INTERNAL int
BerEncoder_determineEncodedBitStringSize(int bitStringSize);
LIB61850_INTERNAL int
BerEncoder_encodeFloat(uint8_t* floatValue, uint8_t formatWidth, uint8_t exponentWidth,
uint8_t* buffer, int bufPos);

8
src/mms/inc_private/mms_server_internal.h
Unescape Escape View File

@ -1,7 +1,7 @@
/*
* mms_server_internal.h
*
* Copyright 2013-2018 Michael Zillgith
* Copyright 2013-2022 Michael Zillgith
*
* This file is part of libIEC61850.
*
@ -260,9 +260,6 @@ mmsServer_handleReadRequest(
LIB61850_INTERNAL MmsPdu_t*
mmsServer_createConfirmedResponse(uint32_t invokeId);
LIB61850_INTERNAL void
mmsMsg_createServiceErrorPdu(uint32_t invokeId, ByteBuffer* response, MmsError errorType);
LIB61850_INTERNAL void
mmsMsg_createInitiateErrorPdu(ByteBuffer* response, uint8_t initiateErrorCode);
@ -415,9 +412,6 @@ LIB61850_INTERNAL void
mmsServer_createMmsWriteResponse(MmsServerConnection connection,
uint32_t invokeId, ByteBuffer* response, int numberOfItems, MmsDataAccessError* accessResults);
LIB61850_INTERNAL void
mmsMsg_createMmsRejectPdu(uint32_t* invokeId, int reason, ByteBuffer* response);
LIB61850_INTERNAL MmsError
mmsServer_callVariableListChangedHandler(bool create, MmsVariableListType listType, MmsDomain* domain,
char* listName, MmsServerConnection connection);

Write Preview
Loading…
Cancel
Save