osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More patches from Guy, cleaning up warnings when using gcc -Wall. 

svn path=/trunk/; revision=86
This commit is contained in:
Gilbert Ramirez 1998-11-12 23:29:34 +00:00
parent c90b202b22
commit 1f2a75cd8f
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wiretap/buffer.c
View File

@ -1,6 +1,6 @@
/* buffer.c
*
* $Id: buffer.c,v 1.2 1998/11/12 06:01:18 gram Exp $
* $Id: buffer.c,v 1.3 1998/11/12 23:29:33 gram Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@ -23,9 +23,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "buffer.h"
#include "glib.h"
/*#define DEBUG*/
#define DEBUG_PROGRAM_NAME "buffer.c"

17
wiretap/file.c
View File

@ -1,6 +1,6 @@
/* file.c
*
* $Id: file.c,v 1.2 1998/11/12 06:01:21 gram Exp $
* $Id: file.c,v 1.3 1998/11/12 23:29:34 gram Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@ -23,6 +23,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "wtap.h"
#include "lanalyzer.h"
#include "ngsniffer.h"
@ -49,15 +50,15 @@ wtap* wtap_open_offline(char *filename, int filetype)
/* If the filetype is unknown, try all my file types */
if (filetype == WTAP_FILE_UNKNOWN) {
/* WTAP_FILE_PCAP */
if (wth->file_type = open_file_pcap(wth, filename)) {
if ((wth->file_type = open_file_pcap(wth, filename)) != WTAP_FILE_UNKNOWN) {
goto success;
}
/* WTAP_FILE_NGSNIFFER */
if (wth->file_type = ngsniffer_open(wth)) {
if ((wth->file_type = ngsniffer_open(wth)) != WTAP_FILE_UNKNOWN) {
goto success;
}
/* WTAP_FILE_LANALYZER */
if (wth->file_type = lanalyzer_open(wth)) {
if ((wth->file_type = lanalyzer_open(wth)) != WTAP_FILE_UNKNOWN) {
goto success;
}
@ -69,17 +70,17 @@ wtap* wtap_open_offline(char *filename, int filetype)
/* If the user tells us what the file is supposed to be, check it */
switch (filetype) {
case WTAP_FILE_PCAP:
if (wth->file_type = open_file_pcap(wth, filename)) {
if ((wth->file_type = open_file_pcap(wth, filename)) != WTAP_FILE_UNKNOWN) {
goto success;
}
break;
case WTAP_FILE_NGSNIFFER:
if (wth->file_type = ngsniffer_open(wth)) {
if ((wth->file_type = ngsniffer_open(wth)) != WTAP_FILE_UNKNOWN) {
goto success;
}
break;
case WTAP_FILE_LANALYZER:
if (wth->file_type = lanalyzer_open(wth)) {
if ((wth->file_type = lanalyzer_open(wth)) != WTAP_FILE_UNKNOWN) {
goto success;
}
break;
@ -141,7 +142,7 @@ int open_file_pcap(wtap *wth, char *filename)
static
int convert_dlt_to_wtap_encap(dlt)
int convert_dlt_to_wtap_encap(int dlt)
{
int encap[] = {
WTAP_ENCAP_NONE,