Skip to content

Commit

Permalink
fixed printfs
Browse files Browse the repository at this point in the history
  • Loading branch information
@ktsaou
ktsaou committed Mar 11, 2017
1 parent 1ea1db5 commit 6c32675
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
16 changes: 8 additions & 8 deletions iprange.c
View file
Expand Up @@ -594,7 +594,7 @@ int main(int argc, char **argv) {

else if(mode == MODE_COUNT_UNIQUE_MERGED) {
if(unlikely(header)) printf("entries,unique_ips\n");
printf("%lu,%lu\n", root->lines, ipset_unique_ips(root));
printf("%zu,%zu\n", root->lines, ipset_unique_ips(root));
}
}
else if(mode == MODE_COMMON) {
Expand Down Expand Up @@ -664,7 +664,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "%s: Cannot find the common IPs of ipset %s and %s\n", PROG, ips->filename, ips2->filename);
exit(1);
}
fprintf(stdout, "%s,%s,%lu,%lu,%lu,%lu,%lu,%lu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, ips->unique_ips + ips2->unique_ips - comips->unique_ips, comips->unique_ips);
fprintf(stdout, "%s,%s,%zu,%zu,%zu,%zu,%zu,%zu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, ips->unique_ips + ips2->unique_ips - comips->unique_ips, comips->unique_ips);
ipset_free(comips);
#else
comips = ipset_combine(ips, ips2);
Expand All @@ -674,7 +674,7 @@ int main(int argc, char **argv) {
}

ipset_optimize(comips);
fprintf(stdout, "%s,%s,%lu,%lu,%lu,%lu,%lu,%lu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, comips->unique_ips, ips->unique_ips + ips2->unique_ips - comips->unique_ips);
fprintf(stdout, "%s,%s,%zu,%zu,%zu,%zu,%zu,%zu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, comips->unique_ips, ips->unique_ips + ips2->unique_ips - comips->unique_ips);
ipset_free(comips);
#endif
}
Expand Down Expand Up @@ -702,7 +702,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "%s: Cannot find the common IPs of ipset %s and %s\n", PROG, ips->filename, ips2->filename);
exit(1);
}
fprintf(stdout, "%s,%s,%lu,%lu,%lu,%lu,%lu,%lu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, ips->unique_ips + ips2->unique_ips - common->unique_ips, common->unique_ips);
fprintf(stdout, "%s,%s,%zu,%zu,%zu,%zu,%zu,%zu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, ips->unique_ips + ips2->unique_ips - common->unique_ips, common->unique_ips);
ipset_free(common);
#else
ipset *combined = ipset_combine(ips, ips2);
Expand All @@ -712,7 +712,7 @@ int main(int argc, char **argv) {
}

ipset_optimize(combined);
fprintf(stdout, "%s,%s,%lu,%lu,%lu,%lu,%lu,%lu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, combined->unique_ips, ips->unique_ips + ips2->unique_ips - combined->unique_ips);
fprintf(stdout, "%s,%s,%zu,%zu,%zu,%zu,%zu,%zu\n", ips->filename, ips2->filename, ips->lines, ips2->lines, ips->unique_ips, ips2->unique_ips, combined->unique_ips, ips->unique_ips + ips2->unique_ips - combined->unique_ips);
ipset_free(combined);
#endif
}
Expand Down Expand Up @@ -740,7 +740,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "%s: Cannot find the comips IPs of ipset %s and %s\n", PROG, ips->filename, first->filename);
exit(1);
}
printf("%s,%lu,%lu,%lu\n", ips->filename, ips->lines, ips->unique_ips, comips->unique_ips);
printf("%s,%zu,%zu,%zu\n", ips->filename, ips->lines, ips->unique_ips, comips->unique_ips);
ipset_free(comips);
#else
comips = ipset_combine(ips, first);
Expand All @@ -750,7 +750,7 @@ int main(int argc, char **argv) {
}

ipset_optimize(comips);
printf("%s,%lu,%lu,%lu\n", ips->filename, ips->lines, ips->unique_ips, ips->unique_ips + first->unique_ips - comips->unique_ips);
printf("%s,%zu,%zu,%zu\n", ips->filename, ips->lines, ips->unique_ips, ips->unique_ips + first->unique_ips - comips->unique_ips);
ipset_free(comips);
#endif
}
Expand Down Expand Up @@ -792,7 +792,7 @@ int main(int argc, char **argv) {
ipset_optimize_all(root);

for(ips = root; ips ;ips = ips->next) {
printf("%s,%lu,%lu\n", ips->filename, ips->lines, ips->unique_ips);
printf("%s,%zu,%zu\n", ips->filename, ips->lines, ips->unique_ips);
}
gettimeofday(&print_dt, NULL);
}
Expand Down
2 changes: 1 addition & 1 deletion ipset.h
View file
Expand Up @@ -88,7 +88,7 @@ static inline void ipset_added_entry(ipset *ips) {
in_addr_t last_to = ips->netaddrs[ips->entries - 1].broadcast;

char buf[IP2STR_MAX_LEN + 1];
fprintf(stderr, "%s: NON-OPTIMIZED %s at line %lu, entry %lu, last was %s (%u) - ", PROG, ips->filename, ips->lines, ips->entries, ip2str_r(buf, last_from), last_from);
fprintf(stderr, "%s: NON-OPTIMIZED %s at line %zu, entry %zu, last was %s (%u) - ", PROG, ips->filename, ips->lines, ips->entries, ip2str_r(buf, last_from), last_from);
fprintf(stderr, "%s (%u), new is ", ip2str_r(buf, last_to), last_to);
fprintf(stderr, "%s (%u) - ", ip2str_r(buf, new_from), new_from);
fprintf(stderr, "%s (%u)\n", ip2str_r(buf, new_to), new_to);
Expand Down
10 changes: 5 additions & 5 deletions ipset_binary.c
View file
Expand Up @@ -125,11 +125,11 @@ void ipset_save_binary_v10(ipset *ips) {
fprintf(stdout, BINARY_HEADER_V10);
if(ips->flags & IPSET_FLAG_OPTIMIZED) fprintf(stdout, "optimized\n");
else fprintf(stdout, "non-optimized\n");
fprintf(stdout, "record size %lu\n", (unsigned long)sizeof(network_addr_t));
fprintf(stdout, "records %lu\n", ips->entries);
fprintf(stdout, "bytes %lu\n", (sizeof(network_addr_t) * ips->entries) + sizeof(uint32_t));
fprintf(stdout, "lines %lu\n", ips->entries);
fprintf(stdout, "unique ips %lu\n", ips->unique_ips);
fprintf(stdout, "record size %zu\n", sizeof(network_addr_t));
fprintf(stdout, "records %zu\n", ips->entries);
fprintf(stdout, "bytes %zu\n", (sizeof(network_addr_t) * ips->entries) + sizeof(uint32_t));
fprintf(stdout, "lines %zu\n", ips->entries);
fprintf(stdout, "unique ips %zu\n", ips->unique_ips);
fwrite(&endianness, sizeof(uint32_t), 1, stdout);
fwrite(ips->netaddrs, sizeof(network_addr_t), ips->entries, stdout);
}
Expand Down
8 changes: 4 additions & 4 deletions ipset_print.c
View file
Expand Up @@ -71,7 +71,6 @@ inline void print_addr_single(in_addr_t x) {
*/

inline int split_range(in_addr_t addr, int prefix, in_addr_t lo, in_addr_t hi, void (*print)(in_addr_t, int)) {
char buf[IP2STR_MAX_LEN + 1];
in_addr_t bc, lower_half, upper_half;

if(unlikely(lo > hi)) {
Expand All @@ -80,6 +79,7 @@ inline int split_range(in_addr_t addr, int prefix, in_addr_t lo, in_addr_t hi, v
* give a log for the user to see
*/
in_addr_t t = hi;
char buf[IP2STR_MAX_LEN + 1];
fprintf(stderr, "%s: WARNING: invalid range reversed start=%s", PROG, ip2str_r(buf, lo));
fprintf(stderr, " end=%s\n", ip2str_r(buf, hi));
hi = lo;
Expand Down Expand Up @@ -138,7 +138,7 @@ void ipset_print(ipset *ips, IPSET_PRINT_CMD print) {
return;
}

if(unlikely(debug)) fprintf(stderr, "%s: Printing %s with %lu ranges, %lu unique IPs\n", PROG, ips->filename, ips->entries, ips->unique_ips);
if(unlikely(debug)) fprintf(stderr, "%s: Printing %s with %zu ranges, %zu unique IPs\n", PROG, ips->filename, ips->entries, ips->unique_ips);

switch(print) {
case PRINT_CIDR:
Expand Down Expand Up @@ -192,7 +192,7 @@ void ipset_print(ipset *ips, IPSET_PRINT_CMD print) {

if (print == PRINT_CIDR) {

fprintf(stderr, "\n%lu printed CIDRs, break down by prefix:\n", total);
fprintf(stderr, "\n%zu printed CIDRs, break down by prefix:\n", total);

total = 0;
for(i = 0; i <= 32 ;i++) {
Expand All @@ -211,7 +211,7 @@ void ipset_print(ipset *ips, IPSET_PRINT_CMD print) {
else if (print == PRINT_SINGLE_IPS) units = "IPs";
else units = "ranges";

fprintf(stderr, "\ntotals: %lu lines read, %lu distinct IP ranges found, %d CIDR prefixes, %lu %s printed, %lu unique IPs\n", ips->lines, ips->entries, prefixes, total, units, ips->unique_ips);
fprintf(stderr, "\ntotals: %zu lines read, %zu distinct IP ranges found, %d CIDR prefixes, %zu %s printed, %zu unique IPs\n", ips->lines, ips->entries, prefixes, total, units, ips->unique_ips);
}
}
}
4 changes: 2 additions & 2 deletions ipset_reduce.c
View file
Expand Up @@ -50,8 +50,8 @@ void ipset_reduce(ipset *ips, size_t acceptable_increase, size_t min_accepted) {

/* reduce the possible prefixes */
while(total < acceptable) {
ssize_t min = -1, to = -1, j;
size_t min_increase = acceptable * 10, multiplier, increase, old_to_counters;
ssize_t min = -1, to = -1;
size_t j, min_increase = acceptable * 10, multiplier, increase, old_to_counters;

iterations++;

Expand Down

0 comments on commit 6c32675

Please sign in to comment.