From c2c8228d30b530be71654c9cc9264886678a8e75 Mon Sep 17 00:00:00 2001 From: Bin Qian Date: Thu, 16 Aug 2018 15:48:15 -0400 Subject: [PATCH] sm components to use C++11 standard This commit does not have any functional or performance change. This change adds -std=c++11 compile option to Makefiles to enalbe using C++11 standard features. This change also cleans errors that c++11 standard complains: Werror=literal-suffix, e.g: "msg_seq=%"PRIi64"." error: invalid suffix on literal; C++11 requires a space between literal and identifier changed to: "msg_seq=%" PRIi64 "." Story: 2003493 Task: 24770 Change-Id: I0225a4326ff8320f36246cc5678698781e903617 Signed-off-by: Bin Qian --- service-mgmt/sm-1.0.0/src/Makefile | 2 +- service-mgmt/sm-1.0.0/src/sm_alarm_thread.c | 2 +- service-mgmt/sm-1.0.0/src/sm_log_thread.c | 6 +- service-mgmt/sm-1.0.0/src/sm_msg.c | 60 +++++++++---------- ...ice_domain_neighbor_exchange_start_state.c | 2 +- ...m_service_domain_neighbor_exchange_state.c | 4 +- .../src/sm_service_domain_neighbor_fsm.c | 4 +- .../src/sm_service_domain_scheduler.c | 2 +- service-mgmt/sm-1.0.0/src/sm_service_fsm.c | 2 +- service-mgmt/sm-common-1.0.0/src/Makefile | 2 +- .../sm-common-1.0.0/src/sm_debug_thread.c | 2 +- service-mgmt/sm-common-1.0.0/src/sm_eru_db.c | 6 +- service-mgmt/sm-common-1.0.0/src/sm_timer.c | 4 +- service-mgmt/sm-db-1.0.0/src/Makefile | 2 +- .../src/sm_db_service_domain_assignments.c | 2 +- .../src/sm_db_service_domain_neighbors.c | 2 +- .../sm-db-1.0.0/src/sm_db_service_domains.c | 2 +- .../sm-db-1.0.0/src/sm_db_service_heartbeat.c | 2 +- service-mgmt/sm-db-1.0.0/src/sm_db_services.c | 2 +- 19 files changed, 55 insertions(+), 55 deletions(-) diff --git a/service-mgmt/sm-1.0.0/src/Makefile b/service-mgmt/sm-1.0.0/src/Makefile index f4e6de87..433f1ec2 100644 --- a/service-mgmt/sm-1.0.0/src/Makefile +++ b/service-mgmt/sm-1.0.0/src/Makefile @@ -110,7 +110,7 @@ SRCS+=sm_service_domain_interface_not_in_use_state.c SRCS+=sm_configuration_table.c OBJS= $(SRCS:.c=.o) -CCFLAGS= -g -O2 -Wall -Werror -Wformat +CCFLAGS= -g -O2 -Wall -Werror -Wformat -std=c++11 EXTRACCFLAGS= -D__STDC_FORMAT_MACROS LDLIBS= -lsqlite3 -lglib-2.0 -luuid -lpthread -lrt -lsm_common -lsm_db -lfmcommon -ljson-c -lcrypto -lssl LDFLAGS = -rdynamic diff --git a/service-mgmt/sm-1.0.0/src/sm_alarm_thread.c b/service-mgmt/sm-1.0.0/src/sm_alarm_thread.c index 4301065a..c765572c 100644 --- a/service-mgmt/sm-1.0.0/src/sm_alarm_thread.c +++ b/service-mgmt/sm-1.0.0/src/sm_alarm_thread.c @@ -319,7 +319,7 @@ static void sm_alarm_thread_log( SmAlarmEntryT* entry ) char date_str[32]; struct tm t_real; - fprintf( _customer_alarm_log, "alarm-log-id: %"PRIu64"\n", + fprintf( _customer_alarm_log, "alarm-log-id: %" PRIu64 "\n", ++_customer_alarm_log_id ); fprintf( _customer_alarm_log, "alarm-type: %s\n", sm_alarm_thread_alarm_str( entry->alarm ) ); diff --git a/service-mgmt/sm-1.0.0/src/sm_log_thread.c b/service-mgmt/sm-1.0.0/src/sm_log_thread.c index 8632caed..4f51c42b 100644 --- a/service-mgmt/sm-1.0.0/src/sm_log_thread.c +++ b/service-mgmt/sm-1.0.0/src/sm_log_thread.c @@ -256,7 +256,7 @@ static void sm_log_thread_log_brief( const char time[], const char type[], const char state_change[], char reason_text[] ) { - fprintf( _customer_log, "| %s | %10"PRIu64" | %-20s | %-32s | " + fprintf( _customer_log, "| %s | %10" PRIu64 " | %-20s | %-32s | " "%-32s | %-32s | %-s \n", time, ++_customer_log_id, type, entity_name, prev_state_change, state_change, reason_text ); } @@ -287,7 +287,7 @@ static void sm_log_thread_log_reboot( const char reboot_type[], sm_log_thread_log_brief( time_str, reboot_type, reboot->entity_name, "", "", reboot->reason_text ); #else - fprintf( _customer_log, "log-id: %"PRIu64"\n", ++_customer_log_id ); + fprintf( _customer_log, "log-id: %" PRIu64 "\n", ++_customer_log_id ); fprintf( _customer_log, "log-type: reboot\n" ); fprintf( _customer_log, "timestamp: %s\n", time_str ); fprintf( _customer_log, "entity-name: %s\n", reboot->entity_name ); @@ -337,7 +337,7 @@ static void sm_log_thread_log_state_change( const char state_change_type[], prev_state_change_str, state_change_str, state_change->reason_text ); #else - fprintf( _customer_log, "log-id: %"PRIu64"\n", ++_customer_log_id ); + fprintf( _customer_log, "log-id: %" PRIu64 "\n", ++_customer_log_id ); fprintf( _customer_log, "log-type: state-change\n" ); fprintf( _customer_log, "timestamp: %s\n", time_str ); fprintf( _customer_log, "entity-name: %s\n", state_change->entity_name ); diff --git a/service-mgmt/sm-1.0.0/src/sm_msg.c b/service-mgmt/sm-1.0.0/src/sm_msg.c index 29ad5194..e3093a90 100644 --- a/service-mgmt/sm-1.0.0/src/sm_msg.c +++ b/service-mgmt/sm-1.0.0/src/sm_msg.c @@ -337,9 +337,9 @@ static bool sm_msg_in_sequence( char node_name[], delta = msg_seq_num- entry->msg_last_seq_num; if( SM_MSG_MAX_SEQ_DELTA < delta ) { - DPRINTFI( "Message sequence delta (%"PRIu64") too large " + DPRINTFI( "Message sequence delta (%" PRIu64 ") too large " "for message instance (%s) from node (%s), " - "rcvd_seq=%"PRIu64", last_recvd_seq=%"PRIu64".", + "rcvd_seq=%" PRIu64 ", last_recvd_seq=%" PRIu64 ".", delta, entry->msg_instance, node_name, msg_seq_num, entry->msg_last_seq_num ); } @@ -352,9 +352,9 @@ static bool sm_msg_in_sequence( char node_name[], if( SM_MSG_MAX_SEQ_DELTA < delta ) { - DPRINTFI( "Message sequence delta (%"PRIu64") too large " + DPRINTFI( "Message sequence delta (%" PRIu64 ") too large " "for message instance (%s) from node (%s), " - "rcvd_seq=%"PRIu64", last_recvd_seq=%"PRIu64".", + "rcvd_seq=%" PRIu64 ", last_recvd_seq=%" PRIu64 ".", delta, entry->msg_instance, node_name, msg_seq_num, entry->msg_last_seq_num ); @@ -1697,12 +1697,12 @@ static void sm_msg_dispatch_msg( bool is_multicast_msg, SmMsgT* msg, ntohll(msg->header.msg_seq_num) )) ) { DPRINTFD( "Duplicate message received from node (%s), " - "msg_seq=%"PRIi64".", msg->header.node_name, + "msg_seq=%" PRIi64 ".", msg->header.node_name, ntohll(msg->header.msg_seq_num) ); return; } else { DPRINTFD( "Message received from node (%s), " - "msg_seq=%"PRIi64".", msg->header.node_name, + "msg_seq=%" PRIi64 ".", msg->header.node_name, ntohll(msg->header.msg_seq_num) ); } @@ -3303,30 +3303,30 @@ void sm_msg_dump_data( FILE* log ) { fprintf( log, "--------------------------------------------------------------------\n" ); fprintf( log, "MESSAGING DATA\n" ); - fprintf( log, " rcvd_total_msgs..............................%"PRIu64"\n", _rcvd_total_msgs ); - fprintf( log, " rcvd_msgs_while_disabled.....................%"PRIu64"\n", _rcvd_msgs_while_disabled ); - fprintf( log, " rcvd_bad_msg_auth............................%"PRIu64"\n", _rcvd_bad_msg_auth ); - fprintf( log, " rcvd_bad_msg_version.........................%"PRIu64"\n", _rcvd_bad_msg_version ); - fprintf( log, " send_node_hello_count........................%"PRIu64"\n", _send_node_hello_cnt ); - fprintf( log, " rcvd_node_hello_count........................%"PRIu64"\n", _rcvd_node_hello_cnt ); - fprintf( log, " send_node_update_count.......................%"PRIu64"\n", _send_node_update_cnt ); - fprintf( log, " rcvd_node_update_count.......................%"PRIu64"\n", _rcvd_node_update_cnt ); - fprintf( log, " send_node_swact_count........................%"PRIu64"\n", _send_node_swact_cnt ); - fprintf( log, " rcvd_node_swact_count........................%"PRIu64"\n", _rcvd_node_swact_cnt ); - fprintf( log, " send_node_swact_ack_count....................%"PRIu64"\n", _send_node_swact_ack_cnt ); - fprintf( log, " rcvd_node_swact_ack_count....................%"PRIu64"\n", _rcvd_node_swact_ack_cnt ); - fprintf( log, " send_service_domain_hello_count..............%"PRIu64"\n", _send_service_domain_hello_cnt ); - fprintf( log, " rcvd_service_domain_hello_count..............%"PRIu64"\n", _rcvd_service_domain_hello_cnt ); - fprintf( log, " send_service_domain_pause_count..............%"PRIu64"\n", _send_service_domain_pause_cnt ); - fprintf( log, " rcvd_service_domain_pause_count..............%"PRIu64"\n", _rcvd_service_domain_pause_cnt ); - fprintf( log, " send_service_domain_exchange_start_count.....%"PRIu64"\n", _send_service_domain_exchange_start_cnt ); - fprintf( log, " rcvd_service_domain_exchange_start_count.....%"PRIu64"\n", _rcvd_service_domain_exchange_start_cnt ); - fprintf( log, " send_service_domain_exchange_count...........%"PRIu64"\n", _send_service_domain_exchange_cnt ); - fprintf( log, " rcvd_service_domain_exchange_count...........%"PRIu64"\n", _rcvd_service_domain_exchange_cnt ); - fprintf( log, " send_service_domain_member_request_count.....%"PRIu64"\n", _send_service_domain_member_request_cnt ); - fprintf( log, " rcvd_service_domain_member_request_count.....%"PRIu64"\n", _rcvd_service_domain_member_request_cnt ); - fprintf( log, " send_service_domain_member_update_count......%"PRIu64"\n", _send_service_domain_member_update_cnt ); - fprintf( log, " rcvd_service_domain_member_update_count......%"PRIu64"\n", _rcvd_service_domain_member_update_cnt ); + fprintf( log, " rcvd_total_msgs..............................%" PRIu64 "\n", _rcvd_total_msgs ); + fprintf( log, " rcvd_msgs_while_disabled.....................%" PRIu64 "\n", _rcvd_msgs_while_disabled ); + fprintf( log, " rcvd_bad_msg_auth............................%" PRIu64 "\n", _rcvd_bad_msg_auth ); + fprintf( log, " rcvd_bad_msg_version.........................%" PRIu64 "\n", _rcvd_bad_msg_version ); + fprintf( log, " send_node_hello_count........................%" PRIu64 "\n", _send_node_hello_cnt ); + fprintf( log, " rcvd_node_hello_count........................%" PRIu64 "\n", _rcvd_node_hello_cnt ); + fprintf( log, " send_node_update_count.......................%" PRIu64 "\n", _send_node_update_cnt ); + fprintf( log, " rcvd_node_update_count.......................%" PRIu64 "\n", _rcvd_node_update_cnt ); + fprintf( log, " send_node_swact_count........................%" PRIu64 "\n", _send_node_swact_cnt ); + fprintf( log, " rcvd_node_swact_count........................%" PRIu64 "\n", _rcvd_node_swact_cnt ); + fprintf( log, " send_node_swact_ack_count....................%" PRIu64 "\n", _send_node_swact_ack_cnt ); + fprintf( log, " rcvd_node_swact_ack_count....................%" PRIu64 "\n", _rcvd_node_swact_ack_cnt ); + fprintf( log, " send_service_domain_hello_count..............%" PRIu64 "\n", _send_service_domain_hello_cnt ); + fprintf( log, " rcvd_service_domain_hello_count..............%" PRIu64 "\n", _rcvd_service_domain_hello_cnt ); + fprintf( log, " send_service_domain_pause_count..............%" PRIu64 "\n", _send_service_domain_pause_cnt ); + fprintf( log, " rcvd_service_domain_pause_count..............%" PRIu64 "\n", _rcvd_service_domain_pause_cnt ); + fprintf( log, " send_service_domain_exchange_start_count.....%" PRIu64 "\n", _send_service_domain_exchange_start_cnt ); + fprintf( log, " rcvd_service_domain_exchange_start_count.....%" PRIu64 "\n", _rcvd_service_domain_exchange_start_cnt ); + fprintf( log, " send_service_domain_exchange_count...........%" PRIu64 "\n", _send_service_domain_exchange_cnt ); + fprintf( log, " rcvd_service_domain_exchange_count...........%" PRIu64 "\n", _rcvd_service_domain_exchange_cnt ); + fprintf( log, " send_service_domain_member_request_count.....%" PRIu64 "\n", _send_service_domain_member_request_cnt ); + fprintf( log, " rcvd_service_domain_member_request_count.....%" PRIu64 "\n", _rcvd_service_domain_member_request_cnt ); + fprintf( log, " send_service_domain_member_update_count......%" PRIu64 "\n", _send_service_domain_member_update_cnt ); + fprintf( log, " rcvd_service_domain_member_update_count......%" PRIu64 "\n", _rcvd_service_domain_member_update_cnt ); fprintf( log, "--------------------------------------------------------------------\n" ); } // **************************************************************************** diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.c b/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.c index b0d83433..8be1ae8a 100644 --- a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.c +++ b/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.c @@ -44,7 +44,7 @@ static bool sm_service_domain_neighbor_exchange_start_timeout( neighbor = sm_service_domain_neighbor_table_read_by_id( id ); if( NULL == neighbor ) { - DPRINTFE( "Failed to read neighbor (%"PRIi64"), error=%s.", id, + DPRINTFE( "Failed to read neighbor (%" PRIi64 "), error=%s.", id, sm_error_str(SM_NOT_FOUND) ); return( true ); } diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.c b/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.c index f813a006..47bdf820 100644 --- a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.c +++ b/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.c @@ -37,7 +37,7 @@ static bool sm_service_domain_neighbor_exchange_timeout( SmTimerIdT timer_id, neighbor = sm_service_domain_neighbor_table_read_by_id( id ); if( NULL == neighbor ) { - DPRINTFE( "Failed to read neighbor (%"PRIi64"), error=%s.", id, + DPRINTFE( "Failed to read neighbor (%" PRIi64 "), error=%s.", id, sm_error_str(SM_NOT_FOUND) ); return( true ); } @@ -258,7 +258,7 @@ static void sm_service_domain_neighbor_exchange_receive( if( last_received_member_id != neighbor->exchange_last_sent_id ) { DPRINTFE( "Member id mismatch from neighbor (%s) for service domain " - "(%s), received=%"PRIi64", expected=%"PRIi64".", + "(%s), received=%" PRIi64 ", expected=%" PRIi64 ".", node_name, service_domain_name, last_received_member_id, neighbor->exchange_last_sent_id ); return; diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.c b/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.c index 254541c3..b1feee53 100644 --- a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.c +++ b/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.c @@ -85,7 +85,7 @@ static bool sm_service_domain_neighbor_fsm_pause_timeout( SmTimerIdT timer_id, neighbor = sm_service_domain_neighbor_table_read_by_id( id ); if( NULL == neighbor ) { - DPRINTFE( "Failed to read neighbor (%"PRIi64"), error=%s.", id, + DPRINTFE( "Failed to read neighbor (%" PRIi64 "), error=%s.", id, sm_error_str(SM_NOT_FOUND) ); return( true ); } @@ -204,7 +204,7 @@ static bool sm_service_domain_neighbor_fsm_dead_timeout( SmTimerIdT timer_id, neighbor = sm_service_domain_neighbor_table_read_by_id( id ); if( NULL == neighbor ) { - DPRINTFE( "Failed to read neighbor (%"PRIi64"), error=%s.", id, + DPRINTFE( "Failed to read neighbor (%" PRIi64 "), error=%s.", id, sm_error_str(SM_NOT_FOUND) ); return( true ); } diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.c b/service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.c index 816e51dc..77e30bc0 100644 --- a/service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.c +++ b/service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.c @@ -975,7 +975,7 @@ static void sm_service_domain_scheduler_dump_entry( void* user_data[], SCHED_LOG( assignment->name, " Node (%s) - Service Group (%s) - " "desired_state=%s, state=%s, status=%s, condition=%s, " - "health=%"PRIX64", last_state_change=%li, sched_state=%s, " + "health=%" PRIX64 ", last_state_change=%li, sched_state=%s, " "sched_weight=%i.", assignment->node_name, assignment->service_group_name, sm_service_group_state_str(assignment->desired_state), diff --git a/service-mgmt/sm-1.0.0/src/sm_service_fsm.c b/service-mgmt/sm-1.0.0/src/sm_service_fsm.c index a2670181..bc71882c 100644 --- a/service-mgmt/sm-1.0.0/src/sm_service_fsm.c +++ b/service-mgmt/sm-1.0.0/src/sm_service_fsm.c @@ -1442,7 +1442,7 @@ static void sm_service_fsm_process_failure_callback( pid_t pid, int exit_code, service = sm_service_table_read_by_pid( (int) pid ); if( NULL == service ) { - DPRINTFE( "Failed to read service based on pid (%"PRIu64"), error=%s.", + DPRINTFE( "Failed to read service based on pid (%" PRIu64 "), error=%s.", user_data, sm_error_str(SM_NOT_FOUND) ); return; } diff --git a/service-mgmt/sm-common-1.0.0/src/Makefile b/service-mgmt/sm-common-1.0.0/src/Makefile index cef8d325..c0f22de3 100644 --- a/service-mgmt/sm-common-1.0.0/src/Makefile +++ b/service-mgmt/sm-common-1.0.0/src/Makefile @@ -29,7 +29,7 @@ OBJS = $(SRCS:.c=.o) CCFLAGS= -fPIC -g -O2 -Wall -Werror EXTRACCFLAGS= -D__STDC_FORMAT_MACROS -DSW_VERSION=\"$(SW_VERSION)\" -LDLIBS= -lsqlite3 -lglib-2.0 -lgmodule-2.0 -luuid -lrt -lpthread +LDLIBS= -lsqlite3 -lglib-2.0 -lgmodule-2.0 -luuid -lrt -lpthread -std=c++11 LDFLAGS = -shared -rdynamic build: libsm_common.so libsm_watchdog_nfs.so sm_watchdog sm_eru sm_eru_dump diff --git a/service-mgmt/sm-common-1.0.0/src/sm_debug_thread.c b/service-mgmt/sm-common-1.0.0/src/sm_debug_thread.c index aa96a390..5582424b 100644 --- a/service-mgmt/sm-common-1.0.0/src/sm_debug_thread.c +++ b/service-mgmt/sm-common-1.0.0/src/sm_debug_thread.c @@ -86,7 +86,7 @@ static void sm_debug_thread_dispatch( int selobj, int64_t user_data ) sm_time_get( &time_prev ); - SM_WRITE_SYSLOG( "time[%ld.%03ld] log<%"PRIu64"> %s", + SM_WRITE_SYSLOG( "time[%ld.%03ld] log<%" PRIu64 "> %s", (long) msg.u.log.ts_mono.tv_sec, (long) msg.u.log.ts_mono.tv_nsec/1000000, msg.u.log.seqnum, msg.u.log.data ); diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_db.c b/service-mgmt/sm-common-1.0.0/src/sm_eru_db.c index 1b91fa8e..45b20bff 100644 --- a/service-mgmt/sm-common-1.0.0/src/sm_eru_db.c +++ b/service-mgmt/sm-common-1.0.0/src/sm_eru_db.c @@ -433,9 +433,9 @@ void sm_eru_db_display( SmEruDatabaseEntryT* entry, bool want_raw ) break; case SM_ERU_DATABASE_ENTRY_TYPE_TC_STATS: - printf( "tc-stats: %s %s %s bytes: %"PRIu64" packets: %"PRIu64 - " qlen: %"PRIu64" backlog: %"PRIu64" drops: %"PRIu64 - " requeues: %"PRIu64" overlimits: %"PRIu64"\n", + printf( "tc-stats: %s %s %s bytes: %" PRIu64 " packets: %" PRIu64 + " qlen: %" PRIu64 " backlog: %" PRIu64 " drops: %" PRIu64 + " requeues: %" PRIu64 " overlimits: %" PRIu64 "\n", qdisc->interface_name, qdisc->queue_type, qdisc->handle, qdisc->bytes, qdisc->packets, qdisc->q_length, qdisc->backlog, qdisc->drops, diff --git a/service-mgmt/sm-common-1.0.0/src/sm_timer.c b/service-mgmt/sm-common-1.0.0/src/sm_timer.c index 7c84e005..8790456a 100644 --- a/service-mgmt/sm-common-1.0.0/src/sm_timer.c +++ b/service-mgmt/sm-common-1.0.0/src/sm_timer.c @@ -489,9 +489,9 @@ void sm_timer_dump_data( FILE* log ) { fprintf( log, " timer (name=%s, id=%i)\n", timer_entry->timer_name, timer_entry->timer_id ); - fprintf( log, " instance..........%"PRIu64"\n", timer_entry->timer_instance ); + fprintf( log, " instance..........%" PRIu64 "\n", timer_entry->timer_instance ); fprintf( log, " ms_interval.......%i\n", timer_entry->ms_interval ); - fprintf( log, " user_data.........%"PRIi64"\n", timer_entry->user_data ); + fprintf( log, " user_data.........%" PRIi64 "\n", timer_entry->user_data ); sm_time_format_monotonic_time(&timer_entry->arm_timestamp, buffer, sizeof(buffer)); fprintf( log, " timer created at .%s\n", buffer ); sm_time_format_realtime(&timer_entry->last_fired, buffer, sizeof(buffer)); diff --git a/service-mgmt/sm-db-1.0.0/src/Makefile b/service-mgmt/sm-db-1.0.0/src/Makefile index 71472cfc..c6be42f7 100644 --- a/service-mgmt/sm-db-1.0.0/src/Makefile +++ b/service-mgmt/sm-db-1.0.0/src/Makefile @@ -28,7 +28,7 @@ SRCS+=sm_db_build.c SRCS+=sm_db_configuration.c OBJS = $(SRCS:.c=.o) -CCFLAGS= -fPIC -g -O2 -Wall -Werror +CCFLAGS= -fPIC -g -O2 -Wall -Werror -std=c++11 EXTRACCFLAGS= -D__STDC_FORMAT_MACROS LDLIBS= -lsqlite3 -lglib-2.0 -luuid -lrt -lsm_common LDFLAGS = -shared -rdynamic diff --git a/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_assignments.c b/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_assignments.c index 821673fa..0baa92d1 100644 --- a/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_assignments.c +++ b/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_assignments.c @@ -170,7 +170,7 @@ SmErrorT sm_db_service_domain_assignments_read_by_id( memset( record, 0, sizeof(SmDbServiceDomainAssignmentT) ); - snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%"PRIi64"';", + snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%" PRIi64 "';", SM_SERVICE_DOMAIN_ASSIGNMENTS_TABLE_NAME, SM_SERVICE_DOMAIN_ASSIGNMENTS_TABLE_COLUMN_ID, id ); diff --git a/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_neighbors.c b/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_neighbors.c index 23e4ace4..809c8015 100644 --- a/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_neighbors.c +++ b/service-mgmt/sm-db-1.0.0/src/sm_db_service_domain_neighbors.c @@ -179,7 +179,7 @@ SmErrorT sm_db_service_domain_neighbors_read_by_id( SmDbHandleT* sm_db_handle, memset( record, 0, sizeof(SmDbServiceDomainNeighborT) ); - snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%"PRIi64"';", + snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%" PRIi64 "';", SM_SERVICE_DOMAIN_NEIGHBORS_TABLE_NAME, SM_SERVICE_DOMAIN_NEIGHBORS_TABLE_COLUMN_ID, id ); diff --git a/service-mgmt/sm-db-1.0.0/src/sm_db_service_domains.c b/service-mgmt/sm-db-1.0.0/src/sm_db_service_domains.c index e916a54d..38a4a420 100644 --- a/service-mgmt/sm-db-1.0.0/src/sm_db_service_domains.c +++ b/service-mgmt/sm-db-1.0.0/src/sm_db_service_domains.c @@ -207,7 +207,7 @@ SmErrorT sm_db_service_domains_read_by_id( SmDbHandleT* sm_db_handle, memset( record, 0, sizeof(SmDbServiceDomainT) ); - snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%"PRIi64"';", + snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%" PRIi64 "';", SM_SERVICE_DOMAINS_TABLE_NAME, SM_SERVICE_DOMAINS_TABLE_COLUMN_ID, id ); diff --git a/service-mgmt/sm-db-1.0.0/src/sm_db_service_heartbeat.c b/service-mgmt/sm-db-1.0.0/src/sm_db_service_heartbeat.c index f9d3503c..3e215899 100644 --- a/service-mgmt/sm-db-1.0.0/src/sm_db_service_heartbeat.c +++ b/service-mgmt/sm-db-1.0.0/src/sm_db_service_heartbeat.c @@ -209,7 +209,7 @@ SmErrorT sm_db_service_heartbeat_read_by_id( SmDbHandleT* sm_db_handle, memset( record, 0, sizeof(SmDbServiceHeartbeatT) ); - snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%"PRIi64"';", + snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%" PRIi64 "';", SM_SERVICE_HEARTBEAT_TABLE_NAME, SM_SERVICE_HEARTBEAT_TABLE_COLUMN_ID, id ); diff --git a/service-mgmt/sm-db-1.0.0/src/sm_db_services.c b/service-mgmt/sm-db-1.0.0/src/sm_db_services.c index 66dca285..c2ecccd3 100644 --- a/service-mgmt/sm-db-1.0.0/src/sm_db_services.c +++ b/service-mgmt/sm-db-1.0.0/src/sm_db_services.c @@ -179,7 +179,7 @@ SmErrorT sm_db_services_read_by_id( SmDbHandleT* sm_db_handle, int64_t id, memset( record, 0, sizeof(SmDbServiceT) ); - snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%"PRIi64"';", + snprintf( sql, sizeof(sql), "SELECT * FROM %s WHERE %s = '%" PRIi64 "';", SM_SERVICES_TABLE_NAME, SM_SERVICES_TABLE_COLUMN_ID, id ); rc = sqlite3_exec( (sqlite3*) sm_db_handle, sql,