aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2012-08-09 18:26:08 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2012-08-09 18:26:08 +0000
commit23c35e6d14f1105ae4d50ee7abcd203e2f775860 (patch)
treea23e18aeea2154c959e01e4e5f8db6c08c046ea4 /epan/crypt
parent664e7ed5ad1c1e97556c75fbd51212f7d3107b71 (diff)
Small fixes:
- put back return NULL in line 947 that got removed in r44384: it is mandatory to avoid accessing non initialized variables. Change rlc_channel_assign a bit to fix what was the root cause of this removal (I guess) - put back add_channel_info in dissect_rlc_am (removed by error?) - fix some typo errors - fix indentation a bit svn path=/trunk/; revision=44393
Diffstat (limited to 'epan/crypt')
-rw-r--r--epan/crypt/kasumi.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/crypt/kasumi.h b/epan/crypt/kasumi.h
index 7f3a61af78..1538e11510 100644
--- a/epan/crypt/kasumi.h
+++ b/epan/crypt/kasumi.h
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef _UMTS_KASMUI_H_
-#define _UMTS_KASMUI_H_
+#ifndef KASUMI_H
+#define KASUMI_H
/*This needs to be set in order to indicate presence of KASUMI implementation!*/
#define HAVE_UMTS_KASUMI 0
-#endif /* _UMTS_KASMUI_H_ */
+#endif /* KASUMI_H */