|
1 | | -From e844f6462955d7416300c1a02e9227339b7293b8 Mon Sep 17 00:00:00 2001 |
2 | | -From: jiangcuo <jiangcuo@bingsin.com> |
3 | | -Date: Fri, 17 Nov 2023 09:10:39 +0000 |
4 | | -Subject: [PATCH] init for riscv64 |
5 | | - |
6 | | ---- |
7 | | - data/src/Makefile | 2 +- |
8 | | - data/src/database.c | 2 +- |
9 | | - data/src/dcdb.c | 2 +- |
10 | | - data/src/dfsm.c | 4 ++-- |
11 | | - data/src/logger.c | 2 +- |
12 | | - data/src/memdb.c | 6 +++--- |
13 | | - data/src/status.c | 8 ++++---- |
14 | | - debian/changelog | 6 ++++++ |
15 | | - 8 files changed, 19 insertions(+), 13 deletions(-) |
16 | | - |
17 | | -diff --git a/data/src/Makefile b/data/src/Makefile |
18 | | -index 3d39201..976cbba 100644 |
19 | | ---- a/data/src/Makefile |
20 | | -+++ b/data/src/Makefile |
| 1 | +diff --git a/src/pmxcfs/Makefile b/src/pmxcfs/Makefile |
| 2 | +index 42ea4b6..85ba91f 100644 |
| 3 | +--- a/src/pmxcfs/Makefile |
| 4 | ++++ b/src/pmxcfs/Makefile |
21 | 5 | @@ -3,7 +3,7 @@ DEPENDENCIES=libcpg libcmap libquorum libqb glib-2.0 fuse sqlite3 librrd |
22 | 6 |
|
23 | 7 | CC = gcc |
24 | 8 | CFLAGS += -std=gnu99 |
25 | 9 | -CFLAGS += -Wall -Werror -Wno-unknown-pragmas -Wno-strict-aliasing |
26 | 10 | +CFLAGS += -Wall -Werror -Wno-unknown-pragmas -Wno-strict-aliasing -Wno-unused-result |
27 | 11 | CFLAGS += -Wpedantic |
28 | | - CFLAGS += -g -O2 -Wl,-z,relro |
| 12 | + CFLAGS += -g -O2 |
29 | 13 | CFLAGS += -I. |
30 | | -diff --git a/data/src/database.c b/data/src/database.c |
31 | | -index 80e0b60..9abcea0 100644 |
32 | | ---- a/data/src/database.c |
33 | | -+++ b/data/src/database.c |
34 | | -@@ -356,7 +356,7 @@ static gboolean bdb_backend_load_index( |
35 | | - |
36 | | - if (te->type == DT_REG) { |
37 | | - if (size > 0) |
38 | | -- te->data.value = g_memdup(value, size); |
39 | | -+ te->data.value = g_memdup2(value, size); |
40 | | - } else if (te->type == DT_DIR) { |
41 | | - if (size) { |
42 | | - cfs_critical("directory inode contains data (inode = %016" PRIX64 ")", |
43 | | -diff --git a/data/src/dcdb.c b/data/src/dcdb.c |
44 | | -index b690355..4194ce8 100644 |
45 | | ---- a/data/src/dcdb.c |
46 | | -+++ b/data/src/dcdb.c |
47 | | -@@ -347,7 +347,7 @@ dcdb_parse_update_inode( |
48 | | - te->type = type; |
49 | | - |
50 | | - if (te->type == DT_REG && te->size) { |
51 | | -- te->data.value = g_memdup(data, te->size); |
52 | | -+ te->data.value = g_memdup2(data, te->size); |
53 | | - if (!te->data.value) { |
54 | | - memdb_tree_entry_free(te); |
55 | | - return NULL; |
56 | | -diff --git a/data/src/dfsm.c b/data/src/dfsm.c |
57 | | -index ddfcc23..84f7df7 100644 |
58 | | ---- a/data/src/dfsm.c |
59 | | -+++ b/data/src/dfsm.c |
60 | | -@@ -460,7 +460,7 @@ dfsm_queue_add_message( |
61 | | - |
62 | | - qm->nodeid = nodeid; |
63 | | - qm->pid = pid; |
64 | | -- qm->msg = g_memdup (msg, msg_len); |
65 | | -+ qm->msg = g_memdup2 (msg, msg_len); |
66 | | - qm->msg_len = msg_len; |
67 | | - qm->msg_count = msg_count; |
68 | | - |
69 | | -@@ -877,7 +877,7 @@ dfsm_cpg_deliver_callback( |
70 | | - goto leave; |
71 | | - } |
72 | | - |
73 | | -- ni->state = g_memdup(msg, msg_len); |
74 | | -+ ni->state = g_memdup2(msg, msg_len); |
75 | | - ni->state_len = msg_len; |
76 | | - |
77 | | - int received_all = 1; |
78 | | -diff --git a/data/src/logger.c b/data/src/logger.c |
79 | | -index 4cf9cce..38feb06 100644 |
80 | | ---- a/data/src/logger.c |
81 | | -+++ b/data/src/logger.c |
82 | | -@@ -589,7 +589,7 @@ clusterlog_get_state( |
83 | | - } |
84 | | - |
85 | | - *res_len = clog_size(cl->base); |
86 | | -- gpointer msg = g_memdup(cl->base, *res_len); |
87 | | -+ gpointer msg = g_memdup2(cl->base, *res_len); |
88 | | - |
89 | | - g_mutex_unlock(&cl->mutex); |
90 | | - |
91 | | -diff --git a/data/src/memdb.c b/data/src/memdb.c |
92 | | -index 7ec7e0b..4a4ce89 100644 |
93 | | ---- a/data/src/memdb.c |
94 | | -+++ b/data/src/memdb.c |
95 | | -@@ -73,7 +73,7 @@ memdb_tree_entry_copy( |
96 | | - cpy->size = te->size; |
97 | | - |
98 | | - if (with_data && te->size && te->type == DT_REG) { |
99 | | -- cpy->data.value = g_memdup(te->data.value, te->size); |
100 | | -+ cpy->data.value = g_memdup2(te->data.value, te->size); |
101 | | - } else { |
102 | | - cpy->data.value = NULL; |
103 | | - } |
104 | | -@@ -676,7 +676,7 @@ memdb_read_nolock( |
105 | | - |
106 | | - if ((te = memdb_lookup_path(memdb, path, &parent))) { |
107 | | - if (te->type == DT_REG) { |
108 | | -- *data_ret = g_memdup(te->data.value, te->size); |
109 | | -+ *data_ret = g_memdup2(te->data.value, te->size); |
110 | | - guint32 size = te->size; |
111 | | - return size; |
112 | | - } |
113 | | -@@ -1451,7 +1451,7 @@ memdb_index_copy(memdb_index_t *idx) |
114 | | - return NULL; |
115 | | - } |
116 | | - |
117 | | -- memdb_index_t *copy = (memdb_index_t *)g_memdup(idx, bytes); |
118 | | -+ memdb_index_t *copy = (memdb_index_t *)g_memdup2(idx, bytes); |
119 | | - |
120 | | - return copy; |
121 | | - } |
122 | | -diff --git a/data/src/status.c b/data/src/status.c |
123 | | -index ff0b1e9..0b17cfa 100644 |
124 | | ---- a/data/src/status.c |
125 | | -+++ b/data/src/status.c |
126 | | -@@ -1008,14 +1008,14 @@ kventry_hash_set( |
127 | | - g_hash_table_remove(kvhash, key); |
128 | | - } else if ((entry = (kventry_t *)g_hash_table_lookup(kvhash, key))) { |
129 | | - g_free(entry->data); |
130 | | -- entry->data = g_memdup(data, len); |
131 | | -+ entry->data = g_memdup2(data, len); |
132 | | - entry->len = len; |
133 | | - entry->version++; |
134 | | - } else { |
135 | | - kventry_t *entry = g_new0(kventry_t, 1); |
136 | | - |
137 | | - entry->key = g_strdup(key); |
138 | | -- entry->data = g_memdup(data, len); |
139 | | -+ entry->data = g_memdup2(data, len); |
140 | | - entry->len = len; |
141 | | - |
142 | | - g_hash_table_replace(kvhash, entry->key, entry); |
143 | | -@@ -1372,14 +1372,14 @@ rrdentry_hash_set( |
144 | | - rrdentry_t *entry; |
145 | | - if ((entry = (rrdentry_t *)g_hash_table_lookup(rrdhash, key))) { |
146 | | - g_free(entry->data); |
147 | | -- entry->data = g_memdup(data, len); |
148 | | -+ entry->data = g_memdup2(data, len); |
149 | | - entry->len = len; |
150 | | - entry->time = time(NULL); |
151 | | - } else { |
152 | | - rrdentry_t *entry = g_new0(rrdentry_t, 1); |
153 | | - |
154 | | - entry->key = g_strdup(key); |
155 | | -- entry->data = g_memdup(data, len); |
156 | | -+ entry->data = g_memdup2(data, len); |
157 | | - entry->len = len; |
158 | | - entry->time = time(NULL); |
159 | | - |
0 commit comments