Diff of /trunk/teraterm/ttpset/ttset.c

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/teraterm/ttpset/ttset.c




Diff of /trunk/teraterm/ttpset/ttset.c



 Parent Directory

|  Revision Log



|  Patch














revision 6921 by maya,
Sat Aug 26 15:04:49 2017 UTC




revision 6947 by doda,
Tue Oct 17 09:38:24 2017 UTC






#

Line 1086 
 void PASCAL ReadIniFile(PCHAR FName, PTT


Line 1086 
 void PASCAL ReadIniFile(PCHAR FName, PTT












1086
                                 ts->LogTimestampFormat, sizeof(ts->LogTimestampFormat),
                                 ts->LogTimestampFormat, sizeof(ts->LogTimestampFormat),

















1087
                                 FName);
                                 FName);

















1088
 
 















1089


         /* Use UTC/GMT time for Log each line timestamp */


         /* Timestamp type */













1090


         ts->LogTimestampUTC = GetOnOff(Section, "LogTimestampUTC", FName, FALSE);


         GetPrivateProfileString(Section, "LogTimestampType", "", Temp, sizeof(Temp), FName);













1091


 


         if (_stricmp(Temp, "UTC") == 0)













1092


 


                 ts->LogTimestampType = TIMESTAMP_UTC;













1093


 


         else if (_stricmp(Temp, "LoggingElapsed") == 0)













1094


 


                 ts->LogTimestampType = TIMESTAMP_ELAPSED_LOGSTART;













1095


 


         else if (_stricmp(Temp, "ConnectionElapsed") == 0)













1096


 


                 ts->LogTimestampType = TIMESTAMP_ELAPSED_CONNECTED;













1097


 


         else if (_stricmp(Temp, "") == 0 && GetOnOff(Section, "LogTimestampUTC", FName, FALSE))













1098


 


                 // LogTimestampType が未設定の場合は LogTimestampUTC の値を参照する













1099


 


                 ts->LogTimestampType = TIMESTAMP_UTC;













1100


 


         else













1101


 


                 ts->LogTimestampType = TIMESTAMP_LOCAL;















1102
 
 

















1103
         /* File Transfer dialog visibility */
         /* File Transfer dialog visibility */

















1104
         ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);
         ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);











#

Line 2638 
 void PASCAL WriteIniFile(PCHAR FName, PT


Line 2649 
 void PASCAL WriteIniFile(PCHAR FName, PT












2649
         WritePrivateProfileString(Section, "LogTimestampFormat",
         WritePrivateProfileString(Section, "LogTimestampFormat",

















2650
                                   ts->LogTimestampFormat, FName);
                                   ts->LogTimestampFormat, FName);

















2651
 
 















2652


         /* Use UTC/GMT time for Log each line timestamp */


         /* Timestamp type */













2653


         WriteOnOff(Section, "LogTimestampUTC", FName, ts->LogTimestampUTC);


         switch (ts->LogTimestampType) {













2654


 


         case TIMESTAMP_LOCAL:













2655


 


                 WritePrivateProfileString(Section, "LogTimestampType", "Local", FName);













2656


 


                 break;













2657


 


         case TIMESTAMP_UTC:













2658


 


                 WritePrivateProfileString(Section, "LogTimestampType", "UTC", FName);













2659


 


                 break;













2660


 


         case TIMESTAMP_ELAPSED_LOGSTART:













2661


 


                 WritePrivateProfileString(Section, "LogTimestampType", "LoggingElapsed", FName);













2662


 


                 break;













2663


 


         case TIMESTAMP_ELAPSED_CONNECTED:













2664


 


                 WritePrivateProfileString(Section, "LogTimestampType", "ConnectionElapsed", FName);













2665


 


                 break;













2666


 


         }















2667
 
 

















2668
         /* Default Log file name (2006.8.28 maya) */
         /* Default Log file name (2006.8.28 maya) */

















2669
         WritePrivateProfileString(Section, "LogDefaultName",
         WritePrivateProfileString(Section, "LogDefaultName",





























Legend:



Removed from v.6921
 


changed lines


 
Added in v.6947













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/teraterm/ttpset/ttset.c
-revision 6921 by maya,
Sat Aug 26 15:04:49 2017 UTC
+revision 6947 by doda,
Tue Oct 17 09:38:24 2017 UTC
 Line 1086 
 void PASCAL ReadIniFile(PCHAR FName, PTT
                                  ts->LogTimestampFormat, sizeof(ts->LogTimestampFormat),
                                  FName);
-         /* Use UTC/GMT time for Log each line timestamp */
+         /* Timestamp type */
-         ts->LogTimestampUTC = GetOnOff(Section, "LogTimestampUTC", FName, FALSE);
+         GetPrivateProfileString(Section, "LogTimestampType", "", Temp, sizeof(Temp), FName);
+         if (_stricmp(Temp, "UTC") == 0)
+                 ts->LogTimestampType = TIMESTAMP_UTC;
+         else if (_stricmp(Temp, "LoggingElapsed") == 0)
+                 ts->LogTimestampType = TIMESTAMP_ELAPSED_LOGSTART;
+         else if (_stricmp(Temp, "ConnectionElapsed") == 0)
+                 ts->LogTimestampType = TIMESTAMP_ELAPSED_CONNECTED;
+         else if (_stricmp(Temp, "") == 0 && GetOnOff(Section, "LogTimestampUTC", FName, FALSE))
+                 // LogTimestampType が未設定の場合は LogTimestampUTC の値を参照する
+                 ts->LogTimestampType = TIMESTAMP_UTC;
+         else
+                 ts->LogTimestampType = TIMESTAMP_LOCAL;
          /* File Transfer dialog visibility */
          ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);
-Line 2638 
 void PASCAL WriteIniFile(PCHAR FName, PT
+Line 2649 
 void PASCAL WriteIniFile(PCHAR FName, PT
          WritePrivateProfileString(Section, "LogTimestampFormat",
                                    ts->LogTimestampFormat, FName);
-         /* Use UTC/GMT time for Log each line timestamp */
+         /* Timestamp type */
-         WriteOnOff(Section, "LogTimestampUTC", FName, ts->LogTimestampUTC);
+         switch (ts->LogTimestampType) {
+         case TIMESTAMP_LOCAL:
+                 WritePrivateProfileString(Section, "LogTimestampType", "Local", FName);
+                 break;
+         case TIMESTAMP_UTC:
+                 WritePrivateProfileString(Section, "LogTimestampType", "UTC", FName);
+                 break;
+         case TIMESTAMP_ELAPSED_LOGSTART:
+                 WritePrivateProfileString(Section, "LogTimestampType", "LoggingElapsed", FName);
+                 break;
+         case TIMESTAMP_ELAPSED_CONNECTED:
+                 WritePrivateProfileString(Section, "LogTimestampType", "ConnectionElapsed", FName);
+                 break;
+         }
          /* Default Log file name (2006.8.28 maya) */
          WritePrivateProfileString(Section, "LogDefaultName",
 Legend:



Removed from v.6921
 


changed lines


 
Added in v.6947
 Legend:



Removed from v.6921
 


changed lines


 
Added in v.6947
-Removed from v.6921
+Added in v.6947
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository