Dissector: refactor, change coding style

[ngadmin] / cli / admin.c

diff --git a/cli/admin.c b/cli/admin.c
index eddbf83b797179367d405b72a88757458e7d8536..b23018d25b5f3c1ff0717914b0c127b41534c58c 100644 (file)
--- a/cli/admin.c
+++ b/cli/admin.c
@@ -77,14 +77,9 @@ char* my_generator (const char* text, int state) {
  }
  
  
- while ( (name=tn->name)!=NULL ) {
-  ++tn;
-  
-  if ( strncmp(name, text, len)==0 ) {
+ while ( (name=tn++->name)!=NULL )
+  if ( strncmp(name, text, len)==0 )
    return strdup(name);
-  }
-  
- }
  
  
  return NULL;
@@ -178,6 +173,14 @@ int main (int argc, char **argv) {
  
  
  
+ tcgetattr(STDIN_FILENO, &orig_term);
+ current_term=orig_term;
+ /*
+ current_term.c_lflag&=~ECHOCTL;
+ tcsetattr(STDIN_FILENO, TCSANOW, &current_term);
+ */
+ 
+ 
  opterr=0;
  
  while ( (n=getopt_long(argc, argv, "bfgi:ht:", opts, NULL))!=-1 ) {
@@ -253,13 +256,6 @@ int main (int argc, char **argv) {
  rl_completion_entry_function=my_generator;
  
  
- tcgetattr(STDIN_FILENO, &orig_term);
- current_term=orig_term;
- /*
- current_term.c_lflag&=~ECHOCTL;
- tcsetattr(STDIN_FILENO, TCSANOW, &current_term);
- */
- 
  
  signal(SIGTERM, handler);
  signal(SIGINT, handler);