Change more fopen() to eth_fopen() to finish fixing bug 1827:

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1827

Update README.developer to tell developers not to use fopen() and friends
directly.

svn path=/trunk/; revision=23206

1 files changed, 166 insertions, 166 deletions

diff --git a/wiretap/k12.c b/wiretap/k12.c
index 19364d04f9..48aa620426 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -52,10 +52,10 @@ static unsigned debug_level = 0;
 
 void k12_fprintf(char* fmt, ...) {
     va_list ap;
-    
+
     va_start(ap,fmt);
     vfprintf(dbg_out, fmt, ap);
-    va_end(ap);    
+    va_end(ap);
 }
 
 #define CAT(a,b) a##b
@@ -67,39 +67,39 @@ void k12_fprintf(char* fmt, ...) {
 
 void k12_hexdump(guint level, gint64 offset, char* label, unsigned char* b, unsigned len) {
     static const char* c2t[] = {
-        "00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f", 
-        "10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f", 
-        "20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f", 
-        "30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f", 
-        "40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f", 
-        "50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f", 
-        "60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f", 
-        "70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f", 
-        "80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f", 
-        "90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f", 
-        "a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af", 
-        "b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf", 
-        "c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf", 
-        "d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df", 
-        "e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef", 
+        "00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
+        "10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
+        "20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
+        "30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
+        "40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
+        "50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
+        "60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
+        "70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
+        "80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
+        "90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
+        "a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
+        "b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
+        "c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
+        "d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
+        "e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
         "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff"
     };
     unsigned i;
-	
+
     if (debug_level < level) return;
-    
+
     fprintf(dbg_out,"%s(%.8llx,%.4x): ",label,offset,len);
-    
+
     for (i=0 ; i<len ; i++) {
-		
+
         if (!(i%32))
             fprintf(dbg_out,"\n");
         else if (!(i%4))
             fprintf(dbg_out," ");
-		
+
         fprintf(dbg_out,c2t[b[i]]);
     }
-	
+
 	fprintf(dbg_out,"\n");
 }
 
@@ -129,7 +129,7 @@ static const guint8 k12_file_magic[] = { 0x00, 0x00, 0x02, 0x00 ,0x12, 0x05, 0x0
 struct _k12_t {
     guint32 file_len;
     guint32 num_of_records; /* XXX: not sure about this */
-    
+
     GHashTable* src_by_id; /* k12_srcdsc_recs by input */
     GHashTable* src_by_name; /* k12_srcdsc_recs by stack_name */
 
@@ -152,13 +152,13 @@ typedef struct _k12_src_desc_t {
 #define K12_REC_STK_FILE      0x00070042 /* a dump of an stk file */
 #define K12_REC_SRCDSC2       0x00070043 /* another port-stack mapping */
 #define K12_REC_TEXT          0x00070044 /* a string containing something with a grammar (conditions/responses?) */
-#define K12_REC_START         0x00020030 /* a string containing human readable start time  */ 
+#define K12_REC_START         0x00020030 /* a string containing human readable start time  */
 #define K12_REC_STOP          0x00020031 /* a string containing human readable stop time */
 
 #define K12_MASK_PACKET       0xfffffff0  /* the last nibble in packet records somentimes change (not yet understood why) */
 
 /* offsets of elements in the records */
-#define K12_RECORD_LEN         0x0 /* uint32, in bytes */ 
+#define K12_RECORD_LEN         0x0 /* uint32, in bytes */
 #define K12_RECORD_TYPE        0x4 /* uint32, see above */
 #define K12_RECORD_FRAME_LEN   0x8 /* uint32, in bytes */
 #define K12_RECORD_SRC_ID      0xc /* uint32 */
@@ -177,8 +177,8 @@ typedef struct _k12_src_desc_t {
 
 #define K12_PACKET_FRAME      0x20 /* start of the actual frame in the record */
 
-#define K12_PACKET_OFFSET_VP  0x08 /* 2 bytes, big endian */ 
-#define K12_PACKET_OFFSET_VC  0x0a /* 2 bytes, big endian */ 
+#define K12_PACKET_OFFSET_VP  0x08 /* 2 bytes, big endian */
+#define K12_PACKET_OFFSET_VC  0x0a /* 2 bytes, big endian */
 #define K12_PACKET_OFFSET_CID 0x0c /* 1 byte */
 
 /* elements of the source description records */
@@ -205,7 +205,7 @@ typedef struct _k12_src_desc_t {
  *   This reads the next record without the eventual 0x10 bytes.
  *   returns the lenght of the record + the stuffing (if any)
  *
- * XXX: works at most with 0x1FFF bytes per record 
+ * XXX: works at most with 0x1FFF bytes per record
  */
 static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
 	static guint8* buffer = NULL;
@@ -215,10 +215,10 @@ static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
     guint actual_len, left;
 	guint8 junk[0x14];
 	guint8* writep;
-	
+
 	/* where the next unknown 0x10 bytes are stuffed to the file */
 	guint junky_offset = 0x2000 - (gint) ( (file_offset - 0x200) % 0x2000 );
-	
+
 	K12_DBG(6,("get_record: ENTER: junky_offset=%lld, file_offset=%lld",junky_offset,file_offset));
 
 	/* no buffer is given, lets create it */
@@ -226,26 +226,26 @@ static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
 		buffer = g_malloc(0x2000);
 		buffer_len = 0x2000;
 	}
-	
+
 	*bufferp = buffer;
-	
+
 	if  ( junky_offset == 0x2000 ) {
 		/* the lenght of the record is 0x10 bytes ahead from we are reading */
 		read = file_read(junk,1,0x14,fh);
-        
+
         if (read == 2 && junk[0] == 0xff && junk[1] == 0xff) {
-            K12_DBG(1,("get_record: EOF"));            
+            K12_DBG(1,("get_record: EOF"));
             return 0;
         } else if ( read < 0x14 ){
             K12_DBG(1,("get_record: SHORT READ"));
             return -1;
         }
-		
+
 		memcpy(buffer,&(junk[0x10]),4);
 	} else {
 		/* the lenght of the record is right where we are reading */
 		read = file_read(buffer,1, 0x4, fh);
-		
+
 		if (read == 2 && buffer[0] == 0xff && buffer[1] == 0xff) {
             K12_DBG(1,("get_record: EOF"));
             return 0;
@@ -254,25 +254,25 @@ static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
             return -1;
         }
 	}
-	
+
 	actual_len = left = pntohl(buffer);
 	junky_offset -= 0x4;
-	
+
 	K12_DBG(5,("get_record: GET length=%d",left));
 
 	g_assert(left >= 4);
-	
+
 	while (left > buffer_len) *bufferp = buffer = g_realloc(buffer,buffer_len*=2);
-	
+
 	writep = buffer + 4;
 	left -= 4;
-	
+
 	do {
 		K12_DBG(6,("get_record: looping left=%d junky_offset=%lld",left,junky_offset));
 
 		if (junky_offset > left) {
 			read += last_read = file_read(writep,1, left, fh);
-			
+
 			if ( last_read != left ) {
 				K12_DBG(1,("get_record: SHORT READ"));
 				return -1;
@@ -282,27 +282,27 @@ static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
 			}
 		} else {
 			read += last_read = file_read(writep,1, junky_offset, fh);
-			
+
 			if ( last_read != junky_offset ) {
 				K12_DBG(1,("get_record: SHORT READ, read=%d expected=%d",last_read, junky_offset));
 				return -1;
 			}
-			
+
 			writep += last_read;
 
 			read += last_read = file_read(junk,1, 0x10, fh);
-			
+
 			if ( last_read != 0x10 ) {
 				K12_DBG(1,("get_record: SHORT READ"));
 				return -1;
 			}
-			
+
 			left -= junky_offset;
 			junky_offset = 0x2000;
 		}
-		
+
 	} while(left);
-	
+
 	K12_HEXDMP(5,file_offset, "GOT record", buffer, actual_len);
 	return read;
 }
@@ -316,17 +316,17 @@ static gboolean k12_read(wtap *wth, int *err, gchar **err_info _U_, gint64 *data
 	guint32 src_id;
     guint64 ts;
     guint32 extra_len;
-    
+
     offset = wth->data_offset;
-    
-    /* ignore the record if it isn't a packet */    
+
+    /* ignore the record if it isn't a packet */
     do {
 		K12_DBG(5,("k12_read: offset=%i",offset));
-		
+
         *data_offset = offset;
-        
+
         len = get_record(&buffer, wth->fh, offset);
-        
+
         if (len < 0) {
             *err = WTAP_ERR_SHORT_READ;
             return FALSE;
@@ -334,11 +334,11 @@ static gboolean k12_read(wtap *wth, int *err, gchar **err_info _U_, gint64 *data
             *err = 0;
             return FALSE;
         }
-        
+
         type = pntohl(buffer + K12_RECORD_TYPE);
         src_id = pntohl(buffer + K12_RECORD_SRC_ID);
-	
-		
+
+
         if ( ! (src_desc = g_hash_table_lookup(wth->capture.k12->src_by_id,GUINT_TO_POINTER(src_id))) ) {
 			/*
 			 * Some records from K15 files have a port ID of an undeclared
@@ -349,29 +349,29 @@ static gboolean k12_read(wtap *wth, int *err, gchar **err_info _U_, gint64 *data
 			 */
 			src_desc = g_hash_table_lookup(wth->capture.k12->src_by_id,GUINT_TO_POINTER(src_id&K12_RECORD_SRC_ID_MASK));
 		}
-	
+
         K12_DBG(5,("k12_read: record type=%x src_id=%x",type,src_id));
-        
+
         offset += len;
-        
+
     } while ( ((type & K12_MASK_PACKET) != K12_REC_PACKET) || !src_id || !src_desc );
-    
+
     wth->data_offset = offset;
-    
+
     ts = pntohll(buffer + K12_PACKET_TIMESTAMP);
-    
+
     wth->phdr.ts.secs = (guint32) ((ts / 2000000) + 631152000);
     wth->phdr.ts.nsecs = (guint32) ( (ts % 2000000) * 500 );
-    
+
     K12_DBG(3,("k12_read: PACKET RECORD type=%x src_id=%x secs=%u nsecs=%u",type,src_id, wth->phdr.ts.secs,wth->phdr.ts.nsecs));
-    
+
     wth->phdr.len = wth->phdr.caplen = pntohl(buffer + K12_RECORD_FRAME_LEN) & 0x00001FFF;
     extra_len = len - K12_PACKET_FRAME - wth->phdr.caplen;
-    
+
     /* the frame */
     buffer_assure_space(wth->frame_buffer, wth->phdr.caplen);
     memcpy(buffer_start_ptr(wth->frame_buffer), buffer + K12_PACKET_FRAME, wth->phdr.caplen);
-    
+
     /* extra information need by some protocols */
     buffer_assure_space(&(wth->capture.k12->extra_info), extra_len);
     memcpy(buffer_start_ptr(&(wth->capture.k12->extra_info)),
@@ -380,14 +380,14 @@ static gboolean k12_read(wtap *wth, int *err, gchar **err_info _U_, gint64 *data
     wth->pseudo_header.k12.extra_length = extra_len;
 
     wth->pseudo_header.k12.input = src_id;
-    
+
     K12_DBG(5,("k12_read: wth->pseudo_header.k12.input=%x wth->phdr.len=%i input_name='%s' stack_file='%s' type=%x",
 			   wth->pseudo_header.k12.input,wth->phdr.len,src_desc->input_name,src_desc->stack_file,src_desc->input_type));\
-	
+
 	wth->pseudo_header.k12.input_name = src_desc->input_name;
 	wth->pseudo_header.k12.stack_file = src_desc->stack_file;
 	wth->pseudo_header.k12.input_type = src_desc->input_type;
-	
+
 	switch(src_desc->input_type) {
 		case K12_PORT_ATMPVC:
 		if ((long)(K12_PACKET_FRAME + wth->phdr.len + K12_PACKET_OFFSET_CID) < len) {
@@ -400,11 +400,11 @@ static gboolean k12_read(wtap *wth, int *err, gchar **err_info _U_, gint64 *data
 		default:
 		memcpy(&(wth->pseudo_header.k12.input_info),&(src_desc->input_info),sizeof(src_desc->input_info));
 		break;
-		
+
 	}
 
     wth->pseudo_header.k12.stuff = wth->capture.k12;
-    
+
     return TRUE;
 }
 
@@ -415,19 +415,19 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
     long len;
     guint32 extra_len;
     guint32 input;
-    
+
     K12_DBG(5,("k12_seek_read: ENTER"));
-    
+
     if ( file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) {
         K12_DBG(5,("k12_seek_read: SEEK ERROR"));
         return FALSE;
     }
-    
+
     if ((len = get_record(&buffer, wth->random_fh, seek_off)) < 1) {
         K12_DBG(5,("k12_seek_read: READ ERROR"));
         return FALSE;
     }
-    
+
     memcpy(pd, buffer + K12_PACKET_FRAME, length);
 
     extra_len = len - K12_PACKET_FRAME - length;
@@ -440,10 +440,10 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
         pseudo_header->k12.extra_info = (void*)buffer_start_ptr(&(wth->capture.k12->extra_info));
         pseudo_header->k12.extra_length = extra_len;
     }
-    
+
     input = pntohl(buffer + K12_RECORD_SRC_ID);
     K12_DBG(5,("k12_seek_read: input=%.8x",input));
-    
+
 	if ( ! (src_desc = g_hash_table_lookup(wth->capture.k12->src_by_id,GUINT_TO_POINTER(input))) ) {
 		/*
 		 * Some records from K15 files have a port ID of an undeclared
@@ -454,14 +454,14 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
 		 */
 		src_desc = g_hash_table_lookup(wth->capture.k12->src_by_id,GUINT_TO_POINTER(input&K12_RECORD_SRC_ID_MASK));
 	}
-	
+
     if (src_desc) {
         K12_DBG(5,("k12_seek_read: input_name='%s' stack_file='%s' type=%x",src_desc->input_name,src_desc->stack_file,src_desc->input_type));
         if (pseudo_header) {
             pseudo_header->k12.input_name = src_desc->input_name;
             pseudo_header->k12.stack_file = src_desc->stack_file;
             pseudo_header->k12.input_type = src_desc->input_type;
-            
+
             switch(src_desc->input_type) {
             case K12_PORT_ATMPVC:
                 if ((long)(K12_PACKET_FRAME + length + K12_PACKET_OFFSET_CID) < len) {
@@ -476,11 +476,11 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
                 break;
             }
         }
-        
+
         wth->pseudo_header.k12.input_name = src_desc->input_name;
         wth->pseudo_header.k12.stack_file = src_desc->stack_file;
         wth->pseudo_header.k12.input_type = src_desc->input_type;
-            
+
         switch(src_desc->input_type) {
             case K12_PORT_ATMPVC:
             if ((long)(K12_PACKET_FRAME + length + K12_PACKET_OFFSET_CID) < len) {
@@ -494,7 +494,7 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
             memcpy(&(wth->pseudo_header.k12.input_info),&(src_desc->input_info),sizeof(src_desc->input_info));
             break;
         }
-        
+
     } else {
         K12_DBG(5,("k12_seek_read: NO SRC_RECORD FOUND"));
 
@@ -507,14 +507,14 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
         memset(&(wth->pseudo_header.k12),0,sizeof(wth->pseudo_header.k12));
         wth->pseudo_header.k12.input_name = "unknown port";
         wth->pseudo_header.k12.stack_file = "unknown stack file";
-        
+
     }
-    
+
     if (pseudo_header) {
         pseudo_header->k12.input = input;
         pseudo_header->k12.stuff = wth->capture.k12;
     }
-    
+
     wth->pseudo_header.k12.input = input;
     wth->pseudo_header.k12.stuff = wth->capture.k12;
 
@@ -526,34 +526,34 @@ static gboolean k12_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_head
 
 static k12_t* new_k12_file_data(void) {
     k12_t* fd = g_malloc(sizeof(k12_t));
-    
+
     fd->file_len = 0;
     fd->num_of_records = 0;
     fd->src_by_name = g_hash_table_new(g_str_hash,g_str_equal);
     fd->src_by_id = g_hash_table_new(g_direct_hash,g_direct_equal);
 
     buffer_init(&(fd->extra_info), 100);
-    
+
     return fd;
 }
 
 static gboolean destroy_srcdsc(gpointer k _U_, gpointer v, gpointer p _U_) {
     k12_src_desc_t* rec = v;
-    
+
     if(rec->input_name)
         g_free(rec->input_name);
-    
+
     if(rec->stack_file)
         g_free(rec->stack_file);
-    
+
     g_free(rec);
-    
+
     return TRUE;
 }
 
 static void destroy_k12_file_data(k12_t* fd) {
     g_hash_table_destroy(fd->src_by_id);
-    g_hash_table_foreach_remove(fd->src_by_name,destroy_srcdsc,NULL);    
+    g_hash_table_foreach_remove(fd->src_by_name,destroy_srcdsc,NULL);
     g_hash_table_destroy(fd->src_by_name);
     buffer_free(&(fd->extra_info));
     g_free(fd);
@@ -581,16 +581,16 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
     guint32 stack_len;
     guint i;
     k12_t* file_data;
-    
+
 #ifdef DEBUG_K12
     gchar* env_level = getenv("K12_DEBUG_LEVEL");
     env_file = getenv("K12_DEBUG_FILENAME");
-    if ( env_file ) dbg_out = fopen(env_file,"w");
+    if ( env_file ) dbg_out = eth_fopen(env_file,"w");
     else dbg_out = stderr;
     if ( env_level ) debug_level = strtoul(env_level,NULL,10);
     K12_DBG(1,("k12_open: ENTER debug_level=%u",debug_level));
 #endif
-    
+
     if ( file_read(header_buffer,1,0x200,wth->fh) != 0x200 ) {
         K12_DBG(1,("k12_open: FILE HEADER TOO SHORT"));
         return 0;
@@ -600,31 +600,31 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
             return 0;
         }
     }
-    
+
     offset = 0x200;
-    
+
     file_data = new_k12_file_data();
-    
+
     file_data->file_len = pntohl( header_buffer + 0x8);
     file_data->num_of_records = pntohl( header_buffer + 0xC );
-    
+
     K12_DBG(5,("k12_open: FILE_HEADER OK: offset=%x file_len=%i records=%i",
             offset,
             file_data->file_len,
             file_data->num_of_records ));
-    
+
     do {
-        
+
         len = get_record(&read_buffer, wth->fh, offset);
-        
+
         if ( len <= 0 ) {
             K12_DBG(1,("k12_open: BAD HEADER RECORD",len));
             return -1;
         }
-        
-        
+
+
         type = pntohl( read_buffer + K12_RECORD_TYPE );
-        
+
         if ( (type & K12_MASK_PACKET) == K12_REC_PACKET) {
             /*
              * we are at the first packet record, rewind and leave.
@@ -637,16 +637,16 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
             break;
         } else if (type == K12_REC_SRCDSC || type == K12_REC_SRCDSC2 ) {
             rec = g_malloc0(sizeof(k12_src_desc_t));
-            
+
             rec_len = pntohl( read_buffer + K12_RECORD_LEN );
             extra_len = pntohs( read_buffer + K12_SRCDESC_EXTRALEN );
             name_len = pntohs( read_buffer + K12_SRCDESC_NAMELEN );
             stack_len = pntohs( read_buffer + K12_SRCDESC_STACKLEN );
-            
+
             rec->input = pntohl( read_buffer + K12_RECORD_SRC_ID );
-            
+
             K12_DBG(5,("k12_open: INTERFACE RECORD offset=%x interface=%x",offset,rec->input));
-            
+
             if (name_len == 0 || stack_len == 0
                 || 0x20 + extra_len + name_len + stack_len > rec_len ) {
                 g_free(rec);
@@ -659,11 +659,11 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
                 switch(( rec->input_type = pntohl( read_buffer + K12_SRCDESC_EXTRATYPE ) )) {
                     case K12_PORT_DS0S:
                         rec->input_info.ds0mask = 0x00000000;
-                        
+
                         for (i = 0; i < 32; i++) {
-                            rec->input_info.ds0mask |= ( *(read_buffer + K12_SRCDESC_DS0_MASK + i) == 0xff ) ? 0x1<<(31-i) : 0x0; 
+                            rec->input_info.ds0mask |= ( *(read_buffer + K12_SRCDESC_DS0_MASK + i) == 0xff ) ? 0x1<<(31-i) : 0x0;
                         }
-                        
+
                             break;
                     case K12_PORT_ATMPVC:
                         rec->input_info.atm.vp = pntohs( read_buffer + K12_SRCDESC_ATM_VPI );
@@ -676,19 +676,19 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
                    don't have this information */
                 if (read_buffer[K12_SRCDESC_PORT_TYPE] >= 0x14
                     && read_buffer[K12_SRCDESC_PORT_TYPE] <= 0x17)
-                    /* For ATM2_E1DS1, ATM2_E3DS3, 
+                    /* For ATM2_E1DS1, ATM2_E3DS3,
                        ATM2_STM1EL and ATM2_STM1OP */
                     rec->input_type = K12_PORT_ATMPVC;
             }
 
             rec->input_name = g_memdup(read_buffer + K12_SRCDESC_EXTRATYPE + extra_len, name_len);
             rec->stack_file = g_memdup(read_buffer + K12_SRCDESC_EXTRATYPE + extra_len + name_len, stack_len);
-            
+
             g_strdown(rec->stack_file);
-            
+
             g_hash_table_insert(file_data->src_by_id,GUINT_TO_POINTER(rec->input),rec);
             g_hash_table_insert(file_data->src_by_name,rec->stack_file,rec);
-            
+
             offset += len;
             continue;
         } else {
@@ -696,7 +696,7 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
             continue;
         }
     } while(1);
-    
+
     wth->data_offset = offset;
     wth->file_type = WTAP_FILE_K12;
     wth->file_encap = WTAP_ENCAP_K12;
@@ -705,19 +705,19 @@ int k12_open(wtap *wth, int *err, gchar **err_info _U_) {
     wth->subtype_seek_read = k12_seek_read;
     wth->subtype_close = k12_close;
     wth->capture.k12 = file_data;
-    wth->tsprecision = WTAP_FILE_TSPREC_NSEC;    
+    wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
 
     return 1;
 }
 
 int k12_dump_can_write_encap(int encap) {
-    
+
     if (encap == WTAP_ENCAP_PER_PACKET)
         return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
-    
+
     if (encap != WTAP_ENCAP_K12)
         return WTAP_ERR_UNSUPPORTED_ENCAP;
-    
+
     return 0;
 }
 
@@ -739,7 +739,7 @@ static gboolean do_fwrite(const void *data, size_t size, size_t count, FILE *str
 
 static gboolean k12_dump_record(wtap_dumper *wdh, long len,  guint8* buffer, int *err_p) {
     long junky_offset = (0x2000 - ( (wdh->dump.k12->file_offset - 0x200) % 0x2000 )) % 0x2000;
-    
+
     if (len > junky_offset) {
         if (junky_offset) {
             if (! do_fwrite(buffer, 1, junky_offset, wdh->fh, err_p))
@@ -747,17 +747,17 @@ static gboolean k12_dump_record(wtap_dumper *wdh, long len,  guint8* buffer, int
         }
         if (! do_fwrite(dumpy_junk, 1, 0x10, wdh->fh, err_p))
             return FALSE;
-        
+
         if (! do_fwrite(buffer+junky_offset, 1, len - junky_offset, wdh->fh, err_p))
             return FALSE;
-        
+
         wdh->dump.k12->file_offset += len + 0x10;
     } else {
         if (! do_fwrite(buffer, 1, len, wdh->fh, err_p))
             return FALSE;
         wdh->dump.k12->file_offset += len;
     }
-    
+
     wdh->dump.k12->num_of_records++;
     return TRUE;
 }
@@ -772,48 +772,48 @@ static void k12_dump_src_setting(gpointer k _U_, gpointer v, gpointer p) {
 
     union {
         guint8 buffer[0x2000];
-        
+
         struct {
             guint32 len;
             guint32 type;
             guint32 unk32_1;
             guint32 input;
-            
+
             guint16 unk32_2;
             guint16 color;
             guint32 unk32_3;
             guint32 unk32_4;
             guint16 unk16_1;
             guint16 extra_len;
-            
+
             guint16 name_len;
             guint16 stack_len;
-            
+
             struct {
                 guint32 type;
-                
+
                 union {
                     struct {
                         guint32 unk32;
                         guint8 mask[32];
                     } ds0mask;
-                    
+
                     struct {
                         guint8 unk_data[0x10];
                         guint16 vp;
                         guint16 vc;
                     } atm;
-                    
+
                     guint32 unk;
                 } desc;
             } extra;
         } record;
     } obj;
-    
+
     obj.record.type = g_htonl(K12_REC_SRCDSC);
     obj.record.unk32_1 = g_htonl(0x00000001);
     obj.record.input = g_htonl(src_desc->input);
-    
+
     obj.record.unk32_2 = g_htons(0x0000);
     obj.record.color = g_htons(0x060f);
     obj.record.unk32_3 = g_htonl(0x00000003);
@@ -824,13 +824,13 @@ static void k12_dump_src_setting(gpointer k _U_, gpointer v, gpointer p) {
         default:
             obj.record.unk32_4 = g_htonl(0x01000100);
     }
-    
+
     obj.record.unk16_1 = g_htons(0x0000);
     obj.record.name_len = strlen(src_desc->input_name) + 1;
     obj.record.stack_len = strlen(src_desc->stack_file) + 1;
-    
+
     obj.record.extra.type = g_htonl(src_desc->input_type);
-    
+
     switch (src_desc->input_type) {
         case K12_PORT_ATMPVC:
             obj.record.extra_len = g_htons(0x18);
@@ -851,22 +851,22 @@ static void k12_dump_src_setting(gpointer k _U_, gpointer v, gpointer p) {
             offset = 0x2c;
             break;
     }
-    
+
     memcpy(obj.buffer + offset,
            src_desc->input_name,
            obj.record.name_len);
-    
+
     memcpy(obj.buffer + offset + obj.record.name_len,
            src_desc->stack_file,
            obj.record.stack_len);
-    
+
     len = offset + obj.record.name_len + obj.record.stack_len;
     len += (len % 4) ? 4 - (len % 4) : 0;
-    
+
     obj.record.len = g_htonl(len);
     obj.record.name_len =  g_htons(obj.record.name_len);
     obj.record.stack_len = g_htons(obj.record.stack_len);
-    
+
     k12_dump_record(wdh,len,obj.buffer, &errxxx); /* fwrite errs ignored: see k12_dump below */
 }
 
@@ -881,15 +881,15 @@ static gboolean k12_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
             guint32 type;
             guint32 frame_len;
             guint32 input;
-            
+
             guint32 datum_1;
             guint32 datum_2;
             guint64 ts;
-            
+
             guint8 frame[0x1fc0];
         } record;
     } obj;
-    
+
     if (wdh->dump.k12->num_of_records == 0) {
         k12_t* file_data = pseudo_header->k12.stuff;
         /* XXX: We'll assume that any fwrite errors in k12_dump_src_setting will    */
@@ -901,19 +901,19 @@ static gboolean k12_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     }
     obj.record.len = 0x20 + phdr->len;
     obj.record.len += (obj.record.len % 4) ? 4 - obj.record.len % 4 : 0;
-    
+
     len = obj.record.len;
-    
+
     obj.record.len = g_htonl(obj.record.len);
-    
+
     obj.record.type = g_htonl(K12_REC_PACKET);
     obj.record.frame_len = g_htonl(phdr->len);
     obj.record.input = g_htonl(pseudo_header->k12.input);
-    
+
     obj.record.ts = GUINT64_TO_BE((((guint64)phdr->ts.secs - 631152000) * 2000000) + (phdr->ts.nsecs / 1000 * 2));
-    
+
     memcpy(obj.record.frame,pd,phdr->len);
-    
+
     return k12_dump_record(wdh,len,obj.buffer, err);
 }
 
@@ -924,53 +924,53 @@ static gboolean k12_dump_close(wtap_dumper *wdh, int *err) {
         guint8 b[sizeof(guint32)];
         guint32 u;
     } d;
-    
+
     if (! do_fwrite(k12_eof, 1, 2, wdh->fh, err))
         return FALSE;
-    
+
     if (fseek(wdh->fh, 8, SEEK_SET) == -1) {
         *err = errno;
         return FALSE;
     }
-    
+
     d.u = g_htonl(wdh->dump.k12->file_len);
-    
+
     if (! do_fwrite(d.b, 1, 4, wdh->fh, err))
         return FALSE;
-    
+
     d.u = g_htonl(wdh->dump.k12->num_of_records);
-    
+
     if (! do_fwrite(d.b, 1, 4, wdh->fh, err))
         return FALSE;
-    
+
     return TRUE;
 }
 
 
 gboolean k12_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err) {
-    
+
     if (cant_seek) {
         *err = WTAP_ERR_CANT_WRITE_TO_PIPE;
         return FALSE;
     }
-    
+
     if ( ! do_fwrite(k12_file_magic, 1, 8, wdh->fh, err)) {
         return FALSE;
     }
-    
+
     if (fseek(wdh->fh, 0x200, SEEK_SET) == -1) {
         *err = errno;
         return FALSE;
     }
-    
+
     wdh->subtype_write = k12_dump;
     wdh->subtype_close = k12_dump_close;
-    
+
     wdh->dump.k12 = g_malloc(sizeof(k12_dump_t));
     wdh->dump.k12->file_len = 0x200;
     wdh->dump.k12->num_of_records = 0;
     wdh->dump.k12->file_offset  = 0x200;
-    
+
     return TRUE;
 }