more merge

This commit is contained in:
Olof hagsand 2017-09-27 18:29:13 +02:00
parent c74cdda1e8
commit a2bfe2bdd2
3 changed files with 31 additions and 7 deletions

View file

@ -283,7 +283,7 @@ clicon_option_default(clicon_hash_t *copt)
/* Default is to use line-scrolling */
if (!hash_lookup(copt, "CLICON_CLI_LINESCROLLING")){
if (hash_add(copt, "CLICON_CLI_LINESCROLLING", "1", strlen("1")+1) < 0)
goto catch;
goto done;
}
retval = 0;
done: