[PR #7127] [MERGED] build: merge fnettrace headers into `fnettrace_common.h` #6330

New issue

Closed

opened 2026-05-05 10:54:55 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:54:55 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/7127
Author: @pierretom
Created: 4/4/2026
Status: ✅ Merged
Merged: 4/13/2026
Merged by: @kmk3

Base: master ← Head: patch21

📝 Commits (3)

d93c77f merge src/fnettrace-*/fnettrace_*.h into a single header
75bca04 make it even less redundant
4c24972 improve inclusion in fnettrace_common.h

📊 Changes

6 files changed (+16 additions, -106 deletions)

View changed files

📝 src/fnettrace-dns/main.c (+1 -9)
➖ src/fnettrace-icmp/fnettrace_icmp.h (+0 -34)
📝 src/fnettrace-icmp/main.c (+1 -9)
➖ src/fnettrace-sni/fnettrace_sni.h (+0 -34)
📝 src/fnettrace-sni/main.c (+1 -9)
📝 src/include/fnettrace_common.h (+13 -11)

📄 Description

It's redundant, plus fnettrace_icmp.h and fnettrace_sni.h use the same guard macro.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/7127 **Author:** [@pierretom](https://github.com/pierretom) **Created:** 4/4/2026 **Status:** ✅ Merged **Merged:** 4/13/2026 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `patch21` --- ### 📝 Commits (3) - [`d93c77f`](https://github.com/netblue30/firejail/commit/d93c77f1abc24a08ac2d73fdba5b37ce80de54e4) merge `src/fnettrace-*/fnettrace_*.h` into a single header - [`75bca04`](https://github.com/netblue30/firejail/commit/75bca041b45db93bb01dbcf2cf572c89267268aa) make it even less redundant - [`4c24972`](https://github.com/netblue30/firejail/commit/4c249726219e2df741c23c41e19c115722b23b6d) improve inclusion in fnettrace_common.h ### 📊 Changes **6 files changed** (+16 additions, -106 deletions) <details> <summary>View changed files</summary> 📝 `src/fnettrace-dns/main.c` (+1 -9) ➖ `src/fnettrace-icmp/fnettrace_icmp.h` (+0 -34) 📝 `src/fnettrace-icmp/main.c` (+1 -9) ➖ `src/fnettrace-sni/fnettrace_sni.h` (+0 -34) 📝 `src/fnettrace-sni/main.c` (+1 -9) 📝 `src/include/fnettrace_common.h` (+13 -11) </details> ### 📄 Description It's redundant, plus `fnettrace_icmp.h` and `fnettrace_sni.h` use the same guard macro. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:54:55 -06:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#6330

No description provided.

Rows
Columns

[PR #7127] [MERGED] build: merge fnettrace headers into fnettrace_common.h #6330

📋 Pull Request Information

📝 Commits (3)

📊 Changes

📄 Description

[PR #7127] [MERGED] build: merge fnettrace headers into `fnettrace_common.h` #6330