Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit 065871e

Browse files
t-bbourtemb
authored andcommitted
FileDatabase: Use correct format specifier for unsinged arguments to sscanf
1 parent 969f2ec commit 065871e

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

cppapi/client/filedatabase.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,8 @@ CORBA::Any* FileDatabase :: DbPutDeviceProperty(CORBA::Any& send)
12721272
}
12731273
t_device& device_trovato = *(*(it));
12741274

1275-
sscanf((*data_in)[1],"%6d",&n_properties); index++;
1275+
1276+
sscanf((*data_in)[1],"%6u",&n_properties); index++;
12761277
for (unsigned int i=0; i< n_properties; i++)
12771278
{
12781279
std::vector<t_property*>::iterator prop_it;
@@ -1461,7 +1462,7 @@ CORBA::Any* FileDatabase :: DbPutDeviceAttributeProperty(CORBA::Any& send)
14611462
dev_it = find_if(m_server.devices.begin(), m_server.devices.end(), hasName<t_device>(string((*data_in)[index])));index++;
14621463
if (dev_it != m_server.devices.end())
14631464
{
1464-
sscanf((*data_in)[index],"%6d",&num_attr); index++;
1465+
sscanf((*data_in)[index],"%6u",&num_attr); index++;
14651466
for(unsigned int j = 0; j < num_attr; j++)
14661467
{
14671468
t_attribute_property* temp_attribute_property;
@@ -1480,7 +1481,7 @@ CORBA::Any* FileDatabase :: DbPutDeviceAttributeProperty(CORBA::Any& send)
14801481
//if (equalsIgnoreCase((*dev_it)->attribute_properties[j]->attribute_name, (*data_in)[index].in()))
14811482

14821483
index++;
1483-
sscanf((*data_in)[index],"%6d",&num_prop); index++;
1484+
sscanf((*data_in)[index],"%6u",&num_prop); index++;
14841485
for (unsigned int i = 0; i < num_prop; i++)
14851486
{
14861487
bool exist = false;
@@ -1491,7 +1492,7 @@ CORBA::Any* FileDatabase :: DbPutDeviceAttributeProperty(CORBA::Any& send)
14911492
index++;
14921493
temp_attribute_property->properties[k]->value.erase(temp_attribute_property->properties[k]->value.begin(),
14931494
temp_attribute_property->properties[k]->value.begin()+temp_attribute_property->properties[k]->value.size());
1494-
sscanf((*data_in)[index],"%6d",&num_vals); index++;
1495+
sscanf((*data_in)[index],"%6u",&num_vals); index++;
14951496
for(unsigned int n = 0; n < num_vals; n++)
14961497
{
14971498
temp_attribute_property->properties[k]->value.push_back(string((*data_in)[index])); index++;
@@ -1511,7 +1512,7 @@ CORBA::Any* FileDatabase :: DbPutDeviceAttributeProperty(CORBA::Any& send)
15111512
t_property* new_prop = new t_property;
15121513
new_prop->name = (*data_in)[index]; index++;
15131514

1514-
sscanf((*data_in)[index],"%6d",&num_vals); index++;
1515+
sscanf((*data_in)[index],"%6u",&num_vals); index++;
15151516
for(unsigned int n = 0; n < num_vals; n++)
15161517
{
15171518
new_prop->value.push_back(string((*data_in)[index])); index++;
@@ -1698,7 +1699,7 @@ CORBA::Any* FileDatabase :: DbPutClassProperty(CORBA::Any& send)
16981699
}
16991700
t_tango_class& classe_trovata = *(*(it));
17001701

1701-
sscanf((*data_in)[index],"%6d",&n_properties); index++;
1702+
sscanf((*data_in)[index],"%6u",&n_properties); index++;
17021703
for (unsigned int i=0; i< n_properties; i++)
17031704
{
17041705
std::vector<t_property*>::iterator prop_it;
@@ -1888,7 +1889,7 @@ CORBA::Any* FileDatabase :: DbPutClassAttributeProperty(CORBA::Any& send)
18881889
{
18891890
cout4 << "FILEDATABASE: DbPutClassAttributeProperty class " << string((*data_in)[0]) << " not found." << endl;
18901891
} else {
1891-
sscanf((*data_in)[index],"%6d",&num_attr); index++;
1892+
sscanf((*data_in)[index],"%6u",&num_attr); index++;
18921893
t_tango_class& classe_trovata = *(*(it));
18931894
t_attribute_property* temp_attribute_property;
18941895
std::vector<t_attribute_property*>::iterator attr_prop_it;
@@ -1908,7 +1909,7 @@ CORBA::Any* FileDatabase :: DbPutClassAttributeProperty(CORBA::Any& send)
19081909

19091910
}
19101911
index++;
1911-
sscanf((*data_in)[index],"%6d",&num_prop); index++;
1912+
sscanf((*data_in)[index],"%6u",&num_prop); index++;
19121913
for (unsigned int i = 0; i < num_prop; i++)
19131914
{
19141915
bool exist = false;
@@ -1919,7 +1920,7 @@ CORBA::Any* FileDatabase :: DbPutClassAttributeProperty(CORBA::Any& send)
19191920
index++;
19201921
temp_attribute_property->properties[k]->value.erase(temp_attribute_property->properties[k]->value.begin(),
19211922
temp_attribute_property->properties[k]->value.begin()+temp_attribute_property->properties[k]->value.size());
1922-
sscanf((*data_in)[index],"%6d",&num_vals); index++;
1923+
sscanf((*data_in)[index],"%6u",&num_vals); index++;
19231924
for(unsigned int n = 0; n < num_vals; n++)
19241925
{
19251926
temp_attribute_property->properties[k]->value.push_back(string((*data_in)[index])); index++;
@@ -1939,7 +1940,7 @@ CORBA::Any* FileDatabase :: DbPutClassAttributeProperty(CORBA::Any& send)
19391940
t_property* new_prop = new t_property;
19401941
new_prop->name = (*data_in)[index]; index++;
19411942

1942-
sscanf((*data_in)[index],"%6d",&num_vals); index++;
1943+
sscanf((*data_in)[index],"%6u",&num_vals); index++;
19431944
for(unsigned int n = 0; n < num_vals; n++)
19441945
{
19451946
new_prop->value.push_back(string((*data_in)[index])); index++;

0 commit comments

Comments
 (0)