Commit e513171a4a9317f2fb9184bc34524808de1792be

Authored by Arnaud Blanchard
2 parents 48119736 aea49a66

Merge branch 'master' of https://promethe.u-cergy.fr/blaar/bapps

Showing 1 changed file with 5 additions and 4 deletions
@@ -278,6 +278,10 @@ int main(int argc, char** argv){ @@ -278,6 +278,10 @@ int main(int argc, char** argv){
278 if (keys_nb==-1) keys_nb=channel_info.total_length; 278 if (keys_nb==-1) keys_nb=channel_info.total_length;
279 else if (keys_nb!=channel_info.total_length) EXIT_ON_CHANNEL_ERROR(&channel_info, "number of keys(%d) differ from channel length (%d)", keys_nb, channel.total_length); 279 else if (keys_nb!=channel_info.total_length) EXIT_ON_CHANNEL_ERROR(&channel_info, "number of keys(%d) differ from channel length (%d)", keys_nb, channel.total_length);
280 } 280 }
  281 + else {
  282 + if (type_str) type=STRING_TO_UINT32(type_str);
  283 + else type='UIN8'; //default type
  284 + }
281 285
282 if (key_list==NULL) { 286 if (key_list==NULL) {
283 if (keys_nb==-1){ 287 if (keys_nb==-1){
@@ -297,10 +301,7 @@ int main(int argc, char** argv){ @@ -297,10 +301,7 @@ int main(int argc, char** argv){
297 } 301 }
298 } 302 }
299 303
300 - if (type_str) type=STRING_TO_UINT32(type_str);  
301 - else type='UIN8'; //default type  
302 -  
303 - 304 +
304 305
305 306
306 307