1 |
dagger 11/06/30 16:07:16 |
2 |
|
3 |
Added: dont_use_unsigned_long_long.patch |
4 |
fix_calculating.patch reorder_divisions.patch |
5 |
Log: |
6 |
add version 1.2.5 of smbtatools |
7 |
|
8 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-fs/smbtatools/files/dont_use_unsigned_long_long.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbtatools/files/dont_use_unsigned_long_long.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbtatools/files/dont_use_unsigned_long_long.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: dont_use_unsigned_long_long.patch |
17 |
=================================================================== |
18 |
From 572d4ecabe84f2acee433ff03518af74bcec4dfc Mon Sep 17 00:00:00 2001 |
19 |
From: Holger Hetterich <hhetter@××××××.com> |
20 |
Date: Tue, 7 Jun 2011 13:34:35 +0200 |
21 |
Subject: [PATCH] Don't work with unsigned long long in make_human_readable as |
22 |
lldiv doesn't work unsigned. |
23 |
|
24 |
--- |
25 |
include/common.h | 2 +- |
26 |
src/common/common.c | 4 ++-- |
27 |
src/query/interpreter.c | 10 +++++----- |
28 |
3 files changed, 8 insertions(+), 8 deletions(-) |
29 |
|
30 |
diff --git a/include/common.h b/include/common.h |
31 |
index 4f1a19d..2822f4a 100644 |
32 |
--- a/include/common.h |
33 |
+++ b/include/common.h |
34 |
@@ -80,7 +80,7 @@ enum IntCommands { |
35 |
*/ |
36 |
long long int common_myatoi( char *num); |
37 |
int common_load_key_from_file( struct configuration_data *c); |
38 |
-char *common_make_human_readable( TALLOC_CTX *ctx, unsigned long long z ); |
39 |
+char *common_make_human_readable( TALLOC_CTX *ctx, long long z ); |
40 |
int common_connect_socket( const char *hostname,int iport ); |
41 |
char *common_create_header( TALLOC_CTX *ctx, const char *state_flags, size_t data_len); |
42 |
void common_write_data( char *header, char *data, int dlength, int _socket); |
43 |
diff --git a/src/common/common.c b/src/common/common.c |
44 |
index 139d836..5d51649 100644 |
45 |
--- a/src/common/common.c |
46 |
+++ b/src/common/common.c |
47 |
@@ -32,11 +32,11 @@ void network_close_connection( int sockfd ) { |
48 |
* unsigned long int z bytes. |
49 |
* |
50 |
*/ |
51 |
-char *common_make_human_readable( TALLOC_CTX *ctx, unsigned long long k ) |
52 |
+char *common_make_human_readable( TALLOC_CTX *ctx, long long int k ) |
53 |
{ |
54 |
char kbstring[20]; |
55 |
char *output; |
56 |
- long long kb = (long long ) k; |
57 |
+ long long int kb = (long long ) k; |
58 |
long long int rest = 0; |
59 |
lldiv_t diff; |
60 |
strcpy(kbstring,"Bytes"); |
61 |
diff --git a/src/query/interpreter.c b/src/query/interpreter.c |
62 |
index 62c9ef4..caf0b26 100644 |
63 |
--- a/src/query/interpreter.c |
64 |
+++ b/src/query/interpreter.c |
65 |
@@ -1456,7 +1456,7 @@ void interpreter_fn_total( TALLOC_CTX *ctx, |
66 |
{ |
67 |
char *query1, *query2, *xmldata = NULL; |
68 |
dbi_result qdat; |
69 |
- unsigned long long sum; |
70 |
+ long long sum; |
71 |
if (command_data->argument_count != 1) { |
72 |
printf("ERROR: function total expects one argument.\n"); |
73 |
exit(1); |
74 |
@@ -1473,12 +1473,12 @@ void interpreter_fn_total( TALLOC_CTX *ctx, |
75 |
obj_struct->sql); |
76 |
|
77 |
qdat = sql_query(ctx, config,query1); |
78 |
- sum = strtoull( result_get_element(ctx,0,qdat), |
79 |
+ sum = strtoll( result_get_element(ctx,0,qdat), |
80 |
NULL, 0); |
81 |
const char *errf; |
82 |
dbi_conn_error(config->DBIconn, &errf); |
83 |
qdat = sql_query(ctx, config, query2); |
84 |
- sum = sum + strtoull(result_get_element(ctx,0,qdat), |
85 |
+ sum = sum + strtoll(result_get_element(ctx,0,qdat), |
86 |
NULL,0); |
87 |
xmldata = talloc_asprintf(ctx, |
88 |
"Total number of bytes transfered %s.", |
89 |
@@ -1493,7 +1493,7 @@ void interpreter_fn_total( TALLOC_CTX *ctx, |
90 |
obj_struct->sql); |
91 |
qdat = sql_query(ctx, config,query1); |
92 |
|
93 |
- sum = strtoull(result_get_element(ctx,0,qdat), |
94 |
+ sum = strtoll(result_get_element(ctx,0,qdat), |
95 |
NULL,0); |
96 |
xmldata = talloc_asprintf(ctx, |
97 |
"Total number of bytes read %s.", |
98 |
@@ -1507,7 +1507,7 @@ void interpreter_fn_total( TALLOC_CTX *ctx, |
99 |
"select SUM(length) from write where %s;", |
100 |
obj_struct->sql); |
101 |
qdat = sql_query(ctx, config,query1); |
102 |
- sum = strtoull(result_get_element(ctx,0,qdat), |
103 |
+ sum = strtoll(result_get_element(ctx,0,qdat), |
104 |
NULL,0); |
105 |
xmldata = talloc_asprintf(ctx, |
106 |
"Total number of bytes written %s.", |
107 |
-- |
108 |
1.7.5.3 |
109 |
|
110 |
|
111 |
|
112 |
|
113 |
1.1 net-fs/smbtatools/files/fix_calculating.patch |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbtatools/files/fix_calculating.patch?rev=1.1&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbtatools/files/fix_calculating.patch?rev=1.1&content-type=text/plain |
117 |
|
118 |
Index: fix_calculating.patch |
119 |
=================================================================== |
120 |
From e070f22bd8605a9416a7d83c759a73059c8f1c50 Mon Sep 17 00:00:00 2001 |
121 |
From: Holger Hetterich <hhetter@××××××.com> |
122 |
Date: Tue, 7 Jun 2011 14:07:17 +0200 |
123 |
Subject: [PATCH] Fix calculating |
124 |
|
125 |
--- |
126 |
src/common/common.c | 26 +++++++++++++------------- |
127 |
1 files changed, 13 insertions(+), 13 deletions(-) |
128 |
|
129 |
diff --git a/src/common/common.c b/src/common/common.c |
130 |
index 5d51649..4e6cb07 100644 |
131 |
--- a/src/common/common.c |
132 |
+++ b/src/common/common.c |
133 |
@@ -32,35 +32,35 @@ void network_close_connection( int sockfd ) { |
134 |
* unsigned long int z bytes. |
135 |
* |
136 |
*/ |
137 |
-char *common_make_human_readable( TALLOC_CTX *ctx, long long int k ) |
138 |
+char *common_make_human_readable( TALLOC_CTX *ctx, long long int kb ) |
139 |
{ |
140 |
char kbstring[20]; |
141 |
char *output; |
142 |
- long long int kb = (long long ) k; |
143 |
+ long long int result = 0; |
144 |
long long int rest = 0; |
145 |
lldiv_t diff; |
146 |
strcpy(kbstring,"Bytes"); |
147 |
- if (kb >= 1024) { diff = lldiv(kb, 1024); // kb |
148 |
+ if (kb >= 1024) { diff = lldiv(kb, (long long) 1024); // kb |
149 |
strcpy(kbstring,"KB"); |
150 |
- kb = diff.quot; |
151 |
+ result = diff.quot; |
152 |
rest = diff.rem; |
153 |
} |
154 |
- if (kb >= 1024) { diff = lldiv(kb+rest, 1024); // mb |
155 |
+ if (kb >= 1024) { diff = lldiv(kb,(long long) 1024*1024); // mb |
156 |
strcpy(kbstring,"MB"); |
157 |
- kb = diff.quot; |
158 |
+ result = diff.quot; |
159 |
rest = diff.rem; |
160 |
} |
161 |
if (kb >= 1024) { |
162 |
- diff = lldiv(kb+rest,1024); // gb |
163 |
- kb = diff.quot; |
164 |
- rest = diff.rem; |
165 |
+ diff = lldiv(kb,(long long) 1024*1024*1024); // gb |
166 |
strcpy(kbstring,"GB");} |
167 |
- if (kb >= 1024) { |
168 |
- diff = lldiv(kb+rest,1024); // tb |
169 |
- kb = diff.quot; |
170 |
+ result = diff.quot; |
171 |
rest = diff.rem; |
172 |
+ if (kb >= 1024) { |
173 |
+ diff = lldiv(kb,(long long ) 1024*1024*1024*1024); // tb |
174 |
strcpy(kbstring,"TB");} |
175 |
- output = talloc_asprintf( ctx,"%lli.%lli %s",kb,rest,kbstring); |
176 |
+ result = diff.quot; |
177 |
+ rest = diff.rem; |
178 |
+ output = talloc_asprintf( ctx,"%lli.%lli %s",result,rest,kbstring); |
179 |
return output; |
180 |
} |
181 |
|
182 |
-- |
183 |
1.7.5.3 |
184 |
|
185 |
|
186 |
|
187 |
|
188 |
1.1 net-fs/smbtatools/files/reorder_divisions.patch |
189 |
|
190 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbtatools/files/reorder_divisions.patch?rev=1.1&view=markup |
191 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/smbtatools/files/reorder_divisions.patch?rev=1.1&content-type=text/plain |
192 |
|
193 |
Index: reorder_divisions.patch |
194 |
=================================================================== |
195 |
From a468c8aeb1ef35ed3f314d4ea4f47fc04c403d96 Mon Sep 17 00:00:00 2001 |
196 |
From: Holger Hetterich <hhetter@××××××.com> |
197 |
Date: Tue, 7 Jun 2011 14:48:28 +0200 |
198 |
Subject: [PATCH] Change the order of the divisions |
199 |
|
200 |
|
201 |
diff --git a/src/common/common.c b/src/common/common.c |
202 |
index 4e6cb07..65aae46 100644 |
203 |
--- a/src/common/common.c |
204 |
+++ b/src/common/common.c |
205 |
@@ -36,30 +36,34 @@ char *common_make_human_readable( TALLOC_CTX *ctx, long long int kb ) |
206 |
{ |
207 |
char kbstring[20]; |
208 |
char *output; |
209 |
- long long int result = 0; |
210 |
+ long long int result = kb; |
211 |
long long int rest = 0; |
212 |
lldiv_t diff; |
213 |
strcpy(kbstring,"Bytes"); |
214 |
- if (kb >= 1024) { diff = lldiv(kb, (long long) 1024); // kb |
215 |
- strcpy(kbstring,"KB"); |
216 |
- result = diff.quot; |
217 |
- rest = diff.rem; |
218 |
- } |
219 |
- if (kb >= 1024) { diff = lldiv(kb,(long long) 1024*1024); // mb |
220 |
- strcpy(kbstring,"MB"); |
221 |
- result = diff.quot; |
222 |
- rest = diff.rem; |
223 |
- } |
224 |
- if (kb >= 1024) { |
225 |
- diff = lldiv(kb,(long long) 1024*1024*1024); // gb |
226 |
- strcpy(kbstring,"GB");} |
227 |
- result = diff.quot; |
228 |
- rest = diff.rem; |
229 |
- if (kb >= 1024) { |
230 |
- diff = lldiv(kb,(long long ) 1024*1024*1024*1024); // tb |
231 |
- strcpy(kbstring,"TB");} |
232 |
- result = diff.quot; |
233 |
- rest = diff.rem; |
234 |
+ if (kb >= (long long )1024*1024*1024*1024) { |
235 |
+ diff = lldiv(kb,(long long ) 1024*1024*1024*1024); // tb |
236 |
+ strcpy(kbstring,"TB"); |
237 |
+ result = diff.quot; |
238 |
+ rest = diff.rem; |
239 |
+ } else |
240 |
+ if (kb >= (long long )1024*1024*1024) { |
241 |
+ diff = lldiv(kb,(long long) 1024*1024*1024); // gb |
242 |
+ strcpy(kbstring,"GB"); |
243 |
+ result = diff.quot; |
244 |
+ rest = diff.rem; |
245 |
+ } else |
246 |
+ if (kb >= (long long) 1024*1024) { |
247 |
+ diff = lldiv(kb,(long long) 1024*1024); // mb |
248 |
+ strcpy(kbstring,"MB"); |
249 |
+ result = diff.quot; |
250 |
+ rest = diff.rem; |
251 |
+ } else |
252 |
+ if (kb >= 1024) { |
253 |
+ diff = lldiv(kb, (long long) 1024); // kb |
254 |
+ strcpy(kbstring,"KB"); |
255 |
+ result = diff.quot; |
256 |
+ rest = diff.rem; |
257 |
+ } |
258 |
output = talloc_asprintf( ctx,"%lli.%lli %s",result,rest,kbstring); |
259 |
return output; |
260 |
} |
261 |
-- |
262 |
1.7.5.3 |