diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-05-04 21:29:00 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-05-04 21:29:00 +0000 |
| commit | d12d5a606c142c887d966deeca82377b80a4d5e6 (patch) | |
| tree | 50aa1461f39013b7619462055ece1f9a0f29e179 /epan/dissectors/packet-fclctl.c | |
| parent | 0c1b9e90076234ae88e930fdcefdbe1d7962b210 (diff) | |
AFAICT sys/types.h & netinet/in.h #includes are not needed for these files.
(Let's see if any of the buildbots give any errors).
Also: remove trailing whitespace on lines.
svn path=/trunk/; revision=42429
Diffstat (limited to 'epan/dissectors/packet-fclctl.c')
| -rw-r--r-- | epan/dissectors/packet-fclctl.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c index 0475fb8570..b21508d68d 100644 --- a/epan/dissectors/packet-fclctl.c +++ b/epan/dissectors/packet-fclctl.c @@ -1,5 +1,5 @@ /* packet-fclctl.c - * Routines for FC Link Control Frames + * Routines for FC Link Control Frames * Copyright 2001, Dinesh G Dutt <ddutt@cisco.com> * * $Id$ @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,14 +29,6 @@ #include <stdlib.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #include <glib.h> #include <epan/packet.h> @@ -132,7 +124,7 @@ fclctl_get_typestr (guint8 linkctl_type, guint8 type) { if ((linkctl_type == FC_LCTL_FBSYB) || (linkctl_type == FC_LCTL_FBSYL)) { - return (val_to_str ((type & 0xF0), fc_lctl_fbsy_val, "0x%x")); + return (val_to_str ((type & 0xF0), fc_lctl_fbsy_val, "0x%x")); } return ""; } @@ -141,13 +133,13 @@ const gchar * fclctl_get_paramstr (guint32 linkctl_type, guint32 param) { if (linkctl_type == FC_LCTL_PBSY) { - return g_strdup_printf("%s, %s", + return g_strdup_printf("%s, %s", val_to_str (((param & 0xFF000000) >> 24), fc_lctl_pbsy_acode_val, "0x%x"), val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x")); } if ((linkctl_type == FC_LCTL_FRJT) || (linkctl_type == FC_LCTL_PRJT)) { - return g_strdup_printf("%s, %s", + return g_strdup_printf("%s, %s", val_to_str (((param & 0xFF000000) >> 24), fc_lctl_rjt_acode_val, "0x%x"), val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_rjt_val, "%x")); } |