storage component: update astyle

pull/8637/head
Martin Kojtal 2018-09-25 14:33:19 +01:00 committed by Cruz Monrreal II
parent 6775c9f98c
commit fac5ed0f72
12 changed files with 328 additions and 336 deletions

View File

@ -505,8 +505,7 @@ typedef struct fslittle_fopen_kv_name_ascii_node {
static const uint32_t fslittle_fopen_kv_name_ascii_table_code_sentinel_g = 256;
/*@brief table recording ascii character codes permitted in kv names */
static fslittle_fopen_kv_name_ascii_node fslittle_fopen_kv_name_ascii_table[] =
{
static fslittle_fopen_kv_name_ascii_node fslittle_fopen_kv_name_ascii_table[] = {
{0, true}, /* code 0-33 allowed*/
{34, false}, /* '"' not allowed */
{35, true}, /* allowed */
@ -574,23 +573,19 @@ control_t fslittle_fopen_test_05(const size_t call_count)
/* create bad keyname strings with invalid character code at start of keyname */
node = fslittle_fopen_kv_name_ascii_table;
memset(filename, 0, FSLITTLE_BUF_MAX_LENGTH);
while(node->code != fslittle_fopen_kv_name_ascii_table_code_sentinel_g)
{
while (node->code != fslittle_fopen_kv_name_ascii_table_code_sentinel_g) {
/* loop over range */
for(j = node->code; j < (node+1)->code; j++)
{
for (j = node->code; j < (node + 1)->code; j++) {
if ((j >= 48 && j <= 57) || (j >= 65 && j <= 90) || (j >= 97 && j <= 122)) {
FSLITTLE_DBGLOG("%s: skipping alpha-numeric ascii character code %d (%c).\n", __func__, (int) j, (char) j);
continue;
}
/* set the start, mid, last character of the name to the test char code */
for(pos = (uint32_t) fslittle_fopen_kv_name_pos_start; pos < (uint32_t) fslittle_fopen_kv_name_pos_max; pos++)
{
for (pos = (uint32_t) fslittle_fopen_kv_name_pos_start; pos < (uint32_t) fslittle_fopen_kv_name_pos_max; pos++) {
len = snprintf(filename, filename_len + 1, "%s/%s.%s", mnt_pt, basename, extname);
/* overwrite a char at the pos start, mid, end of the filename with an ascii char code (both illegal and legal)*/
switch(pos)
{
switch (pos) {
case fslittle_fopen_kv_name_pos_start:
filename[5] = (char) j; /* 5 so at to write the second basename char (bad chars as first char not accepted)*/
break;
@ -610,8 +605,7 @@ control_t fslittle_fopen_test_05(const size_t call_count)
#ifdef FSLITTLE_DEBUG
/* processing only required when debug trace enabled */
switch(pos)
{
switch (pos) {
case fslittle_fopen_kv_name_pos_start:
pos_str = "start";
break;
@ -628,8 +622,7 @@ control_t fslittle_fopen_test_05(const size_t call_count)
ret = fslittle_test_create(filename, (const char *) filename, len);
/* special cases */
switch(j)
{
switch (j) {
//case 0 :
//case 46 :
// switch(pos)
@ -650,8 +643,7 @@ control_t fslittle_fopen_test_05(const size_t call_count)
f_allowed = node->f_allowed;
break;
}
if(f_allowed == true)
{
if (f_allowed == true) {
FSLITTLE_TEST_UTEST_MESSAGE(fslittle_fopen_utest_msg_g, FSLITTLE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to create file in store when filename contains valid characters (code=%d, ret=%d).\n", __func__, (int) j, (int) ret);
TEST_ASSERT_MESSAGE(ret >= 0, fslittle_fopen_utest_msg_g);
/* revert FSLITTLE_LOG for more trace */
@ -661,9 +653,8 @@ control_t fslittle_fopen_test_05(const size_t call_count)
ret = fslittle_test_delete(filename);
FSLITTLE_TEST_UTEST_MESSAGE(fslittle_fopen_utest_msg_g, FSLITTLE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to delete file previously created (code=%d, ret=%d).\n", __func__, (int) j, (int) ret);
TEST_ASSERT_MESSAGE(ret >= 0, fslittle_fopen_utest_msg_g);
}
else
{ /*node->f_allowed == false => not allowed to create kv name with ascii code */
} else {
/*node->f_allowed == false => not allowed to create kv name with ascii code */
FSLITTLE_TEST_UTEST_MESSAGE(fslittle_fopen_utest_msg_g, FSLITTLE_UTEST_MSG_BUF_SIZE, "%s:Error: created file in store when filename contains an invalid character (code=%d, ret=%d).\n", __func__, (int) j, (int) ret);
TEST_ASSERT_MESSAGE(ret < 0, fslittle_fopen_utest_msg_g);
/* revert FSLITTLE_LOG for more trace */

View File

@ -107,8 +107,7 @@ int32_t fslittle_test_filename_gen(char* name, const size_t len)
const char *buf = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!$-_@";
const int buf_len = strlen(buf);
FSLITTLE_FENTRYLOG("%s:entered\n", __func__);
for(i = 0; i < len; i++)
{
for (i = 0; i < len; i++) {
pos = rand() % (buf_len);
name[i] = buf[pos];
}

View File

@ -107,8 +107,7 @@ int32_t fsfat_test_filename_gen(char* name, const size_t len)
const char *buf = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!$-_@";
const int buf_len = strlen(buf);
FSFAT_FENTRYLOG("%s:entered\n", __func__);
for(i = 0; i < len; i++)
{
for (i = 0; i < len; i++) {
pos = rand() % (buf_len);
name[i] = buf[pos];
}

View File

@ -101,7 +101,10 @@ public:
/** Desctruct SPIFBlockDevie
*/
~SPIFBlockDevice() {deinit();}
~SPIFBlockDevice()
{
deinit();
}
/** Read blocks from a block device
*