Skip to contentSkip to conversation

dhcpdump: Fix patch file name

PATCH New Benoît Thébaudeau 2 participants 3 messages Aug 5, 2014 – Aug 7, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 dhcpdump: Fix patch file name

Use the naming convention for patches, which is:

<packagename>-<number>-<description>.patch

---

Changes in v2: New patch

---
 ...on-bsd-structures.patch => dhcpdump-0001-use-non-bsd-structures.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/dhcpdump/{dhcpdump-1.8-use-non-bsd-structures.patch => dhcpdump-0001-use-non-bsd-structures.patch} (100%)
package/dhcpdump/dhcpdump-0001-use-non-bsd-structures.patch renamed from package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch +0 -0
similarity index 100%
rename from package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch
rename to package/dhcpdump/dhcpdump-0001-use-non-bsd-structures.patch
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 2/2 dhcpdump: Fix strsep() feature test

Use the official _BSD_SOURCE feature test macro instead of the meaningless HAVE_STRSEP macro in order to detect the availability of strsep().

This allows toolchains supporting strsep() to use it instead of the custom implementation from dhcpdump, which also avoids the following error with some toolchains:

In file included from dhcpdump.c:30:0:
dhcpdump.c: At top level:
strsep.c:65:23: error: register name not specified for ?delim?
register const char *delim;
^

---

Changes in v2:
- Fix patch file name according to patch naming convention.
- Add description and Sob line to patch.

---
 .../dhcpdump-0002-fix-strsep-feature-test.patch    | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/dhcpdump/dhcpdump-0002-fix-strsep-feature-test.patch
package/dhcpdump/dhcpdump-0002-fix-strsep-feature-test.patch new file +27 -0
new file mode 100644
index 0000000..06bab94
@@ -0,0 +1,27 @@
+Use the official _BSD_SOURCE feature test macro instead of the meaningless
+HAVE_STRSEP macro in order to detect the availability of strsep().
+
+This allows toolchains supporting strsep() to use it instead of the custom
+implementation from dhcpdump, which also avoids the following error with some
+toolchains:
+
+	In file included from dhcpdump.c:30:0:
+	dhcpdump.c: At top level:
+	strsep.c:65:23: error: register name not specified for ?delim?
+	  register const char *delim;
+	                       ^
+
+Signed-off-by: Beno?t Th?baudeau <[email protected]>
+
+diff -Nrdup dhcpdump-1.8.orig/dhcpdump.c dhcpdump-1.8/dhcpdump.c
+--- dhcpdump-1.8.orig/dhcpdump.c	2008-06-24 05:26:52.000000000 +0200
++++ dhcpdump-1.8/dhcpdump.c	2011-05-31 19:22:15.987388498 +0200
+@@ -26,7 +26,7 @@
+ #include <regex.h>
+ #include "dhcp_options.h"
+ 
+-#ifndef HAVE_STRSEP
++#ifndef _BSD_SOURCE
+ #include "strsep.c"
+ #endif
+ 
Signature · 1 line
1.9.1
#2 lore raw

PATCH v2 1/2 dhcpdump: Fix patch file name

In reply to Benoît Thébaudeau

Dear Beno?t Th?baudeau,

Quoted 7 lines · Beno?t Th?baudeau

Use the naming convention for patches, which is:

<packagename>-<number>-<description>.patch

---

Both patches applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com