Improving log timer display

diff --git a/lib/devlog.c b/lib/devlog.c
index cfd5e0bea43351926e0d9fc01e9b847dd6cd0bc4..aacb8ebb93c93b4ffbee5596d03926dd220521ab 100644 (file)
--- a/lib/devlog.c
+++ b/lib/devlog.c
@@ -10,6 +10,7 @@
 #include        <malloc.h>
 #include        <stdbool.h>
 #include        <stdio.h>
+#include        <stdlib.h>
 #include        <string.h>
 #include        <unistd.h>
 
@@ -327,11 +328,21 @@ while (proceed==true) {
       else {
         (void) snprintf(chrono,sizeof(chrono),"%12s"," ");
         if (showtime==true) {
-          unsigned int delta;
+          register unsigned int delta;
+          u_int millisec;
+          u_int sec;
+          u_int min;
 
           delta=rou_getdifftime(&(log->start));
-          (void) snprintf(chrono,sizeof(chrono),"%6s%02d.%03d","+",
-                                               delta/1000,delta%1000);
+          millisec=delta%1000;
+          sec=(delta/1000)%60;
+          min=(delta/1000)/60;
+          if (min==0)
+            (void) snprintf(chrono,sizeof(chrono),"%6s%02d.%03d","+",
+                                                   sec,millisec);
+          else
+            (void) snprintf(chrono,sizeof(chrono),"%3s%02d:%02d.%03d","+",
+                                                   min,sec,millisec);
           }
         }
       break;

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 910a2643130de19b0e5b15f5dc4d2d99a851af81..b72fd6a6d6a1cf481eeedf82a3ce1ae514e96a31 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -368,11 +368,9 @@ for (int i=0;i<2;i++) {
      }
   (void) log_fprintlog(contact->logptr,false,"%s",line);
   if ((ptr=cnv_getb64(line))!=(char *)0) {
-    (void) rou_alert(0,"JMPDBG line[%d]=<%s> ptr=<%s>",i,line,ptr);
     (void) strncat(local,ptr,(sizeof(local)-1)-strlen(ptr));
      ptr=rou_freestr(ptr);
      }
-  (void) rou_alert(0,"JMPDBG local[%d]=<%s>",i,local);
   line=rou_freestr(line);
   }
 if (strlen(local)>0)
@@ -412,7 +410,6 @@ if ((data[1]!=(char *)0)&&(data[2]!=(char *)0)) {
     USRTYP *usr;
 
     usr=(USRTYP *)0;
-    (void) rou_alert(0,"JMPDBG name=<%s> pass=<%s>",data[1],data[2]);
     if (sql_mngusr(sqlptr,sql_select,data[1],&usr)==true) {
       char *crypted;
  
@@ -506,7 +503,6 @@ while (proceed==true) {
         }
       break;
     case 4      :       //we have a decoded sequence, check password
-      (void) rou_alert(0,"JMPDBG decoded=<%s>",decoded);
       if (checklogin(contact->sqlptr,decoded)==false) {
         char *fmt;
         char *user;