1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Description: Fix conflicting declarations of some variables
Author: Guillem Jover <gjover@sipwise.com>
Bug-Debian: https://bugs.debian.org/688462
Bug-Debian: https://bugs.debian.org/1074954
Origin: vendor
Forwarded: no
Last-Update: 2024-12-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
db.c | 1 +
dbs.h | 12 ++++++------
msg.c | 10 +++++-----
3 files changed, 12 insertions(+), 11 deletions(-)
--- a/dbs.h
+++ b/dbs.h
@@ -12,9 +12,9 @@ extern char *f_hdr_add[];
extern regex_t *f_rhdr_drop[];
extern regex_t *f_rhdr_match[];
extern char *f_rhdr_entry[];
-extern char *e_inv;
-extern char *e_res;
-extern char *e_con;
-extern char *e_post;
-extern char *e_fil;
-extern char *e_nic;
+extern struct msg e_inv;
+extern struct msg e_res;
+extern struct msg e_con;
+extern struct msg e_post;
+extern struct msg e_fil;
+extern struct msg e_nic;
--- a/msg.c
+++ b/msg.c
@@ -46,19 +46,19 @@ err_msg(int s, struct req * r, int m)
switch (m) {
case E_INV:
- p = e_inv;
+ p = e_inv.c;
break;
case E_RES:
- p = e_res;
+ p = e_res.c;
break;
case E_CON:
- p = e_con;
+ p = e_con.c;
break;
case E_POST:
- p = e_post;
+ p = e_post.c;
break;
case E_FIL:
- p = e_fil;
+ p = e_fil.c;
break;
}
--- a/db.c
+++ b/db.c
@@ -39,6 +39,7 @@
#include "cfg.h"
#include "print.h"
#include "msg.h"
+#include "dbs.h"
#include "alloc.h"
#include "file.h"
#include "db.h"
|
