From: risso <risso>
Date: Mon, 21 Apr 2003 09:29:54 +0000 (+0000)
Subject: Updated the PrintCapBegins function to make it cleaner and more readable
X-Git-Tag: tcpdump-3.8-bp~169
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/925d4b255b092ce7032952fd83705c44229a6192

Updated the PrintCapBegins function to make it cleaner and more readable
---

diff --git a/win32/Src/w32_fzs.c b/win32/Src/w32_fzs.c
index 6838cb95..8c6d314a 100644
--- a/win32/Src/w32_fzs.c
+++ b/win32/Src/w32_fzs.c
@@ -71,34 +71,18 @@ void* GetAdapterFromList(void* device,int index)
 
 void PrintCapBegins (char* program_name, char* device)
 {
-	DWORD dwVersion;
-	DWORD dwWindowsMajorVersion;
-	int ii,jj;
-	char dev[256];
 
-	dwVersion=GetVersion();
-	dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
-	if (dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4)			// Windows '95
+	if(IsTextUnicode(device,  
+		wcslen((short*)device),                // Device always ends with a double \0, so this way to determine its 
+												// length should be always valid
+		NULL))
 	{
-		for(ii=0,jj=0;ii<128;ii++) 
-				if (device[ii]=='\0') break; 
-				else if (device[ii]!='\0') {dev[jj]=device[ii];jj++;}
-		dev[jj]='\0';
-		(void)fprintf(stderr, "%s: listening on %s\n",program_name, dev);
-		(void)fflush(stderr);
+		fprintf(stderr, "%s: listening on %ws\n",program_name, device);
 	}
-
 	else
 	{
-		for(ii=0,jj=0;ii<128;ii++) 
-				if (device[ii]=='\0'&& device[ii+1]=='\0') break; 
-				else if (device[ii]!='\0') {dev[jj]=device[ii];jj++;}
-		dev[jj++]='\0';
-		dev[jj]='\0';
-		fwrite(program_name,strlen(program_name),1,stderr);
-		fwrite(": listening on ",15,1,stderr);
-		fwrite(dev,strlen(dev),1,stderr); 
-		fwrite("\n",1,1,stderr); 
-		(void)fflush(stderr);
+		fprintf(stderr, "%s: listening on %s\n",program_name, device);
 	}
+
+	fflush(stderr);	
 }