Index: uspace/app/pcapctl/main.c
===================================================================
--- uspace/app/pcapctl/main.c	(revision 1d14090b705fa4005fba453cbb74488c510827cc)
+++ uspace/app/pcapctl/main.c	(revision 64ea52540d7ba538c1a62e625d2a88ba1521b400)
@@ -53,6 +53,5 @@
 
 	rc = pcapctl_dump_start(name, sess);
-	if (rc != EOK)
-	{
+	if (rc != EOK) {
 		printf("Starting the dumping was not successful.\n");
 	}
@@ -69,6 +68,5 @@
 	}
 	rc = pcapctl_dump_stop(sess);
-	if (rc != EOK)
-	{
+	if (rc != EOK) {
 		printf("Stoping the dumping was not successful.\n");
 	}
@@ -81,12 +79,10 @@
 	pcapctl_sess_t *sess = NULL;
 	errno_t rc = pcapctl_dump_open(dev_number, &sess);
-	if (rc != EOK)
-	{
+	if (rc != EOK) {
 		return rc;
 	}
 
 	rc = pcapctl_dump_set_ops(name, sess);
-	if (rc != EOK)
-	{
+	if (rc != EOK) {
 		printf("Setting dumper ops was not successful.\n");
 	}
@@ -186,7 +182,5 @@
 		/* stop with dev number */
 		stop_dumping(&dev_number);
-	}
-	else if (set_ops)
-	{
+	} else if (set_ops) {
 		set_dumper_ops(&dev_number, ops_name);
 	}
Index: uspace/lib/pcap/include/pcap.h
===================================================================
--- uspace/lib/pcap/include/pcap.h	(revision 1d14090b705fa4005fba453cbb74488c510827cc)
+++ uspace/lib/pcap/include/pcap.h	(revision 64ea52540d7ba538c1a62e625d2a88ba1521b400)
@@ -80,4 +80,5 @@
 
 typedef struct {
+	errno_t (*open)(struct pcap_writer *, const char *);
 	size_t (*write_u32)(struct pcap_writer *, uint32_t);
 	size_t (*write_u16)(struct pcap_writer *, uint16_t);
@@ -94,10 +95,6 @@
 } pcap_writer_t;
 
-errno_t pcap_writer_to_file_init(pcap_writer_t *writer, const char *filename);
-
 extern void pcap_writer_add_header(pcap_writer_t *);
-extern void pcap_writer_add_packet(
-    pcap_writer_t *writer, const void *captured_packet, size_t size);
-
+extern void pcap_writer_add_packet(pcap_writer_t *writer, const void *captured_packet, size_t size);
 extern void pcap_set_time(pcap_packet_header_t *header);
 
Index: uspace/lib/pcap/src/pcap.c
===================================================================
--- uspace/lib/pcap/src/pcap.c	(revision 1d14090b705fa4005fba453cbb74488c510827cc)
+++ uspace/lib/pcap/src/pcap.c	(revision 64ea52540d7ba538c1a62e625d2a88ba1521b400)
@@ -87,25 +87,4 @@
 }
 
-/** Initialize writing to .pcap file.
- *
- * @param writer    Interface for working with .pcap file
- * @param filename  Name of the file for dumping packets
- * @return          EOK on success or an error code
- *
- */
-errno_t pcap_writer_to_file_init(pcap_writer_t *writer, const char *filename)
-{
-	errno_t rc;
-	writer->data = fopen(filename, "a");
-	if (writer->data == NULL) {
-		rc = EINVAL;
-		return rc;
-	}
-	pcap_writer_add_header(writer);
-
-	rc = EOK;
-	return rc;
-}
-
 /** @}
  */
Index: uspace/lib/pcap/src/pcap_dumper.c
===================================================================
--- uspace/lib/pcap/src/pcap_dumper.c	(revision 1d14090b705fa4005fba453cbb74488c510827cc)
+++ uspace/lib/pcap/src/pcap_dumper.c	(revision 64ea52540d7ba538c1a62e625d2a88ba1521b400)
@@ -38,4 +38,25 @@
 #include "pcap_dumper.h"
 
+/** Initialize writing to .pcap file.
+ *
+ * @param writer    Interface for working with .pcap file
+ * @param filename  Name of the file for dumping packets
+ * @return          EOK on success or an error code
+ *
+ */
+static errno_t pcap_writer_to_file_init(pcap_writer_t *writer, const char *filename)
+{
+	errno_t rc;
+	writer->data = fopen(filename, "a");
+	if (writer->data == NULL) {
+		rc = EINVAL;
+		return rc;
+	}
+	pcap_writer_add_header(writer);
+
+	rc = EOK;
+	return rc;
+}
+
 static size_t pcap_file_w32(pcap_writer_t *writer, uint32_t data)
 {
@@ -61,5 +82,5 @@
 
 static pcap_writer_ops_t file_ops = {
-
+	.open = &pcap_writer_to_file_init,
 	.write_u32 = &pcap_file_w32,
 	.write_u16 = &pcap_file_w16,
@@ -80,5 +101,5 @@
 static size_t pcap_short_file_wbuffer(pcap_writer_t *writer, const void *data, size_t size)
 {
-	return fwrite(data, 1, size<60?size:60, (FILE *)writer->data);
+	return fwrite(data, 1, size < 60 ? size : 60, (FILE *)writer->data);
 }
 
@@ -89,4 +110,5 @@
 
 static pcap_writer_ops_t short_file_ops = {
+	.open = &pcap_writer_to_file_init,
 	.write_u32 = &pcap_short_file_w32,
 	.write_u16 = &pcap_short_file_w16,
@@ -104,5 +126,5 @@
 		pcap_dumper_stop(dumper);
 	}
-	errno_t rc = pcap_writer_to_file_init(&dumper->writer, name);
+	errno_t rc = dumper->writer.ops->open(&dumper->writer, name);
 	if (rc == EOK) {
 		dumper->to_dump = true;
@@ -118,14 +140,9 @@
 	fibril_mutex_lock(&dumper->mutex);
 	errno_t rc = EOK;
-	if (!str_cmp(name, "short_file"))
-	{
+	if (!str_cmp(name, "short_file")) {
 		dumper->writer.ops = &short_file_ops;
-	}
-	else if (!str_cmp(name, "full_file"))
-	{
+	} else if (!str_cmp(name, "full_file")) {
 		dumper->writer.ops = &file_ops;
-	}
-	else
-	{
+	} else {
 		rc = EINVAL;
 	}
@@ -133,5 +150,4 @@
 	return rc;
 }
-
 
 void pcap_dumper_add_packet(struct pcap_dumper *dumper, const void *data, size_t size)