C++ style comments are not allowed in ISO C90. (Fixes the rest of them now that I noticed, "this will be reported only once per input file")
svn path=/trunk/; revision=50613
This commit is contained in:
parent
e7e260b4fc
commit
42b09314b0
16
dumpcap.c
16
dumpcap.c
|
@ -1291,7 +1291,7 @@ print_machine_readable_interfaces(GList *if_list)
|
|||
|
||||
if (capture_child) {
|
||||
/* Let our parent know we succeeded. */
|
||||
pipe_write_block(2, SP_SUCCESS, NULL); ///
|
||||
pipe_write_block(2, SP_SUCCESS, NULL);
|
||||
}
|
||||
|
||||
i = 1; /* Interface id number */
|
||||
|
@ -1369,7 +1369,7 @@ print_machine_readable_if_capabilities(if_capabilities_t *caps)
|
|||
|
||||
if (capture_child) {
|
||||
/* Let our parent know we succeeded. */
|
||||
pipe_write_block(2, SP_SUCCESS, NULL); ///
|
||||
pipe_write_block(2, SP_SUCCESS, NULL);
|
||||
}
|
||||
|
||||
if (caps->can_set_rfmon)
|
||||
|
@ -1445,7 +1445,7 @@ print_statistics_loop(gboolean machine_readable)
|
|||
|
||||
if (capture_child) {
|
||||
/* Let our parent know we succeeded. */
|
||||
pipe_write_block(2, SP_SUCCESS, NULL); ///
|
||||
pipe_write_block(2, SP_SUCCESS, NULL);
|
||||
}
|
||||
|
||||
if (!machine_readable) {
|
||||
|
@ -4107,7 +4107,7 @@ set_80211_channel(const char *iface, const char *opt)
|
|||
}
|
||||
|
||||
if (capture_child)
|
||||
pipe_write_block(2, SP_SUCCESS, NULL); ///
|
||||
pipe_write_block(2, SP_SUCCESS, NULL);
|
||||
ret = 0;
|
||||
|
||||
out:
|
||||
|
@ -4931,7 +4931,7 @@ report_packet_count(unsigned int packet_count)
|
|||
if (capture_child) {
|
||||
g_snprintf(tmp, sizeof(tmp), "%u", packet_count);
|
||||
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Packets: %s", tmp);
|
||||
pipe_write_block(2, SP_PACKET_COUNT, tmp); ///
|
||||
pipe_write_block(2, SP_PACKET_COUNT, tmp);
|
||||
} else {
|
||||
count += packet_count;
|
||||
fprintf(stderr, "\rPackets: %u ", count);
|
||||
|
@ -4945,7 +4945,7 @@ report_new_capture_file(const char *filename)
|
|||
{
|
||||
if (capture_child) {
|
||||
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "File: %s", filename);
|
||||
pipe_write_block(2, SP_FILE, filename); ///
|
||||
pipe_write_block(2, SP_FILE, filename);
|
||||
} else {
|
||||
#ifdef SIGINFO
|
||||
/*
|
||||
|
@ -4984,7 +4984,7 @@ report_cfilter_error(capture_options *capture_opts, guint i, const char *errmsg)
|
|||
if (capture_child) {
|
||||
g_snprintf(tmp, sizeof(tmp), "%u:%s", i, errmsg);
|
||||
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Capture filter error: %s", errmsg);
|
||||
pipe_write_block(2, SP_BAD_FILTER, tmp); ///
|
||||
pipe_write_block(2, SP_BAD_FILTER, tmp);
|
||||
} else {
|
||||
/*
|
||||
* clopts_step_invalid_capfilter in test/suite-clopts.sh MUST match
|
||||
|
@ -5030,7 +5030,7 @@ report_packet_drops(guint32 received, guint32 pcap_drops, guint32 drops, guint32
|
|||
"Packets received/dropped on interface %s: %u/%u (pcap:%u/dumpcap:%u/flushed:%u)",
|
||||
name, received, total_drops, pcap_drops, drops, flushed);
|
||||
/* XXX: Need to provide interface id, changes to consumers required. */
|
||||
pipe_write_block(2, SP_DROPS, tmp); ///
|
||||
pipe_write_block(2, SP_DROPS, tmp);
|
||||
} else {
|
||||
fprintf(stderr,
|
||||
"Packets received/dropped on interface '%s': %u/%u (pcap:%u/dumpcap:%u/flushed:%u) (%.1f%%)\n",
|
||||
|
|
Loading…
Reference in New Issue