starlingx/metal
Code Issues Proposed changes

Merge "Make Mtce system mode scan case in-sensitive"

Browse Source
This commit is contained in:
Zuul 2019-05-07 19:52:52 +00:00 committed by Gerrit Code Review
commit c46e7d1a2c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mtce-common/src/common/nodeUtil.cpp
View File

@ -1472,7 +1472,7 @@ unsigned short checksum(void *b, int len)
} }
std::string tolowercase ( const std::string & in ) std::string tolowercase ( const std::string in )
{ {
std::string out; std::string out;

4
mtce-common/src/common/nodeUtil.h
View File

@ -2,7 +2,7 @@
#define __INCLUDE_NODEUTIL_H__ #define __INCLUDE_NODEUTIL_H__
/* /*
* Copyright (c) 2013-2014, 2016 Wind River Systems, Inc. * Copyright (c) 2013-2014, 2016, 2019 Wind River Systems, Inc.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
@ -104,7 +104,7 @@ string lltos (long long unsigned int val );
string ftos ( float val, int resolution ); string ftos ( float val, int resolution );
unsigned short checksum(void *b, int len); unsigned short checksum(void *b, int len);
std::string tolowercase ( const std::string & in ); std::string tolowercase ( const std::string in );
int get_delimited_list ( string str , char delimiter, list<string> & the_list, bool remove_whitespace ); int get_delimited_list ( string str , char delimiter, list<string> & the_list, bool remove_whitespace );

7
mtce-common/src/daemon/daemon_files.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2016 Wind River Systems, Inc. * Copyright (c) 2013-2019 Wind River Systems, Inc.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
@ -32,6 +32,7 @@ using namespace std;
#include "daemon_common.h" #include "daemon_common.h"
#include "daemon_option.h" #include "daemon_option.h"
#include "nodeBase.h" #include "nodeBase.h"
#include "nodeUtil.h"
/* GNU Extension /* GNU Extension
* program_invocation_name contains the name that was used to invoke the * program_invocation_name contains the name that was used to invoke the
@ -365,7 +366,8 @@ system_type_enum daemon_system_type ( void )
if ( sscanf ( &buffer[0], "system_type=%1023s", &type_str[0] ) == 1 ) if ( sscanf ( &buffer[0], "system_type=%1023s", &type_str[0] ) == 1 )
{ {
string type_string = type_str ; string type_string = type_str ;
if ( !type_string.empty() && ( type_string == "Standard")) type_string = tolowercase(type_string);
if ( !type_string.empty() && ( type_string == "standard"))
{ {
system_type = SYSTEM_TYPE__NORMAL ; system_type = SYSTEM_TYPE__NORMAL ;
} }
@ -400,6 +402,7 @@ system_type_enum daemon_system_type ( void )
if ( sscanf ( &buffer[0], "system_mode=%1023s", &mode_str[0] ) == 1 ) if ( sscanf ( &buffer[0], "system_mode=%1023s", &mode_str[0] ) == 1 )
{ {
string mode = mode_str ; string mode = mode_str ;
mode = tolowercase(mode);
if ( !mode.empty() ) if ( !mode.empty() )
{ {
if ( mode.compare("duplex") == 0 ) if ( mode.compare("duplex") == 0 )

2
mtce/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
SRC_DIR="src" SRC_DIR="src"
TIS_PATCH_VER=149 TIS_PATCH_VER=150
BUILD_IS_SLOW=5 BUILD_IS_SLOW=5