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

Whitespace changes. 

svn path=/trunk/; revision=41113
This commit is contained in:
Michael Tüxen 2012-02-21 15:38:30 +00:00
parent 822782f7c4
commit 3806dfa6c8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcapio.c
View File

@ -289,28 +289,28 @@ libpcap_write_session_header_block(FILE *fp,
/* Size of base header */
block_total_length = sizeof(struct shb) +
sizeof(guint32);
if ((comment)&&(strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(comment) + 1));
have_options = TRUE;
}
if ((hw)&&(strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
if ((hw != NULL) && (strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(hw) + 1));
have_options = TRUE;
}
if ((os)&&(strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(os) + 1));
have_options = TRUE;
}
if ((appname)&&(strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
if ((appname != NULL) && (strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(appname) + 1));
have_options = TRUE;
}
/* If we have options add size of end-of-options */
if(have_options){
if (have_options) {
block_total_length += sizeof(struct option);
}
/* write shb header */
@ -322,7 +322,7 @@ libpcap_write_session_header_block(FILE *fp,
shb.section_length = section_length;
WRITE_DATA(fp, &shb, sizeof(struct shb), *bytes_written, err);
if ((comment)&&(strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
/* write opt_comment options */
option.type = OPT_COMMENT;
option.value_length = (guint16)(strlen(comment) + 1);
@ -332,7 +332,7 @@ libpcap_write_session_header_block(FILE *fp,
WRITE_DATA(fp, &padding, 4 - (strlen(hw) + 1) % 4, *bytes_written, err);
}
}
if ((hw)&&(strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
if ((hw != NULL) && (strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
/* write shb_hardware options */
option.type = SHB_HARDWARE;
option.value_length = (guint16)(strlen(hw) + 1);
@ -342,7 +342,7 @@ libpcap_write_session_header_block(FILE *fp,
WRITE_DATA(fp, &padding, 4 - (strlen(hw) + 1) % 4, *bytes_written, err);
}
}
if ((os)&&(strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
/* write shb_os options */
option.type = SHB_OS;
option.value_length = (guint16)(strlen(os) + 1);
@ -352,7 +352,7 @@ libpcap_write_session_header_block(FILE *fp,
WRITE_DATA(fp, &padding, 4 - (strlen(os) + 1) % 4, *bytes_written, err);
}
}
if ((appname)&&(strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
if ((appname != NULL) && (strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
/* write shb_userappl options */
option.type = SHB_USERAPPL;
option.value_length = (guint16)(strlen(appname) + 1);
@ -362,7 +362,7 @@ libpcap_write_session_header_block(FILE *fp,
WRITE_DATA(fp, &padding, 4 - (strlen(appname) + 1) % 4, *bytes_written, err);
}
}
if(have_options){
if (have_options) {
/* write end of options */
option.type = OPT_ENDOFOPT;
option.value_length = 0;