summaryrefslogtreecommitdiff
path: root/wiretap/logcat.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-06-22 11:48:57 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-22 18:49:24 +0000
commit38e0ad08d3a2e41bc5c7c44fac0acc3b1d8bb650 (patch)
treeaa1d34c6cf268d0327e74bfa9dce2c9eda63b104 /wiretap/logcat.c
parentd51faaaee7439eeac0e67756c25f648e736cd358 (diff)
downloadwireshark-38e0ad08d3a2e41bc5c7c44fac0acc3b1d8bb650.tar.gz
Replace C++-style comments with "#if 0"/"#endif".
checkapi complains about C++-style comments, as some C compilers (IBM XLC, for one) reject them by default, and gcc -pedantic might do so as well. Change-Id: I1719da03d2fed0fe97574e200dd79434b3d760cd Reviewed-on: https://code.wireshark.org/review/2556 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/logcat.c')
-rw-r--r--wiretap/logcat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/wiretap/logcat.c b/wiretap/logcat.c
index d6768f8959..18f9910de5 100644
--- a/wiretap/logcat.c
+++ b/wiretap/logcat.c
@@ -383,7 +383,9 @@ static gboolean logcat_dump_text(wtap_dumper *wdh,
while (dumper->type != DUMP_LONG && (str_end = strchr(str_begin, '\n'))) {
log_part = (gchar *) g_malloc(str_end - str_begin + 1);
g_strlcpy(log_part, str_begin, str_end - str_begin + 1);
-// log_part[str_end - str_begin] = '\0';
+#if 0
+ log_part[str_end - str_begin] = '\0';
+#endif
str_begin = str_end + 1;
buf = logcat_log(dumper, *datetime, *nanoseconds / 1000000, *pid, *tid,
@@ -408,7 +410,9 @@ static gboolean logcat_dump_text(wtap_dumper *wdh,
if (*str_begin != '\0') {
log_part = (gchar *) g_malloc(strlen(str_begin) + 1);
g_strlcpy(log_part, str_begin, strlen(str_begin) + 1);
-// log_part[strlen(str_begin)] = '\0';
+#if 0
+ log_part[strlen(str_begin)] = '\0';
+#endif
buf = logcat_log(dumper, *datetime, *nanoseconds / 1000000, *pid, *tid,
priority, tag, log_part);