Removed even more C++ style comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24186 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 1bc23fa634cdf27ee766315effa17384bdc6b193..f891dcec011413b6ce6e9f9523cedb528f3dfa1c 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -2139,8 +2139,8 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd) {
 
         default: ;
       }
-    }  // j 
-  }  // i 
+    }  /* j */
+  }  /* i */
 
   return private_key; 
 }
@@ -2619,7 +2619,7 @@ ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associa
     service->addr.len = 4;
     service->addr.data = ip = ((guchar*)service) + sizeof(SslService);
     
-    //remove all spaces in addr
+    /* remove all spaces in addr */
     read_index = 0;
     write_index = 0;
     
@@ -2663,7 +2663,7 @@ ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associa
     {  
       private_key = ssl_load_pkcs12(fp,cert_passwd);
     }
-    //!!!
+    /* !!! */
     if (!private_key) {
       fprintf(stderr,"can't load private key from %s\n",
              filename);
@@ -2674,7 +2674,7 @@ ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associa
 
     ssl_debug_printf("ssl_init private key file %s successfully loaded\n",filename);
     
-    //if item exists, remove first 
+    /* if item exists, remove first */
     tmp_private_key = g_hash_table_lookup(key_hash, service);
     if (tmp_private_key) {
       g_hash_table_remove(key_hash, service);

diff --git a/packaging/u3/tools/sysdep.c b/packaging/u3/tools/sysdep.c
index 5099a3faf74e0c37e1f851c162160078bb49fa45..b6f3e324011f5a1ef3617825110e986a95825c46 100644 (file)
--- a/packaging/u3/tools/sysdep.c
+++ b/packaging/u3/tools/sysdep.c
@@ -91,9 +91,9 @@ void get_system_time(uuid_time_t *uuid_time)
     GetSystemTimeAsFileTime((FILETIME *)&time);
     time.QuadPart +=
 
-          (unsigned __int64) (1000*1000*10)       // seconds
-        * (unsigned __int64) (60 * 60 * 24)       // days
-        * (unsigned __int64) (17+30+31+365*18+5); // # of days
+          (unsigned __int64) (1000*1000*10)       /* seconds */
+        * (unsigned __int64) (60 * 60 * 24)       /* days */
+        * (unsigned __int64) (17+30+31+365*18+5); /* # of days */
     *uuid_time = time.QuadPart;
 }
 

diff --git a/packaging/u3/win32/u3util.c b/packaging/u3/win32/u3util.c
index 07f5cc768bce03e6b95ac6587e4a6ed0d280c189..0951c5515e37a672095133f4838c537cdc248f3b 100644 (file)
--- a/packaging/u3/win32/u3util.c
+++ b/packaging/u3/win32/u3util.c
@@ -153,8 +153,8 @@ DWORD TerminateApp( DWORD dwPID, DWORD dwTimeout )
   HANDLE   hProc ;
   DWORD   dwRet ;
 
-  // If we can't open the process with PROCESS_TERMINATE rights,
-  // then we give up immediately.
+  /* If we can't open the process with PROCESS_TERMINATE rights,
+   * then we give up immediately. */
   hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, FALSE, dwPID);
 
   if(hProc == NULL){
@@ -231,7 +231,7 @@ DWORD Terminate16App( DWORD dwPID, DWORD dwThread, WORD w16Task, DWORD dwTimeout
   if( hInstLib == NULL )
     return TA_FAILED ;
 
-  // Get procedure addresses.
+  /* Get procedure addresses. */
   lpfVDMTerminateTaskWOW = (BOOL (WINAPI *)(DWORD, WORD ))
     GetProcAddress( hInstLib, "VDMTerminateTaskWOW" ) ;