projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lintian doesn't like orphan packages with uploaders...
[debian/amanda]
/
client-src
/
sendsize.c
diff --git
a/client-src/sendsize.c
b/client-src/sendsize.c
index 6d9f0c28f0bf83c7b1ba57f15dbb44ece9ecf566..d005fe0dc1872f82525aa4aac561c1a667855944 100644
(file)
--- a/
client-src/sendsize.c
+++ b/
client-src/sendsize.c
@@
-1,6
+1,7
@@
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-135,11
+136,16
@@
main(
char *qamdevice = NULL;
dle_t *dle;
GSList *errlist;
char *qamdevice = NULL;
dle_t *dle;
GSList *errlist;
- level_t *alevel;
+
am_
level_t *alevel;
(void)argc; /* Quiet unused parameter warning */
(void)argv; /* Quiet unused parameter warning */
(void)argc; /* Quiet unused parameter warning */
(void)argv; /* Quiet unused parameter warning */
+ if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+ printf("sendsize-%s\n", VERSION);
+ return (0);
+ }
+
/* initialize */
/*
/* initialize */
/*
@@
-317,7
+323,7
@@
main(
goto err;
}
skip_integer(s, ch);
goto err;
}
skip_integer(s, ch);
- alevel = g_new0(level_t, 1);
+ alevel = g_new0(
am_
level_t, 1);
alevel->level = level;
dle->levellist = g_slist_append(dle->levellist, alevel);
alevel->level = level;
dle->levellist = g_slist_append(dle->levellist, alevel);
@@
-632,7
+638,7
@@
dle_add_diskest(
levellist = dle->levellist;
while (levellist != NULL) {
levellist = dle->levellist;
while (levellist != NULL) {
-
level_t *alevel = (
level_t *)levellist->data;
+
am_level_t *alevel = (am_
level_t *)levellist->data;
if (alevel->level < 0)
alevel->level = 0;
if (alevel->level >= DUMP_LEVELS)
if (alevel->level < 0)
alevel->level = 0;
if (alevel->level >= DUMP_LEVELS)
@@
-645,7
+651,7
@@
dle_add_diskest(
/* already have disk info, just note the level request */
levellist = dle->levellist;
while (levellist != NULL) {
/* already have disk info, just note the level request */
levellist = dle->levellist;
while (levellist != NULL) {
-
level_t *alevel = (
level_t *)levellist->data;
+
am_level_t *alevel = (am_
level_t *)levellist->data;
int level = alevel->level;
curp->est[level].needestimate = 1;
curp->est[level].server = alevel->server;
int level = alevel->level;
curp->est[level].needestimate = 1;
curp->est[level].server = alevel->server;
@@
-672,7
+678,7
@@
dle_add_diskest(
}
levellist = dle->levellist;
while (levellist != NULL) {
}
levellist = dle->levellist;
while (levellist != NULL) {
-
level_t *alevel = (
level_t *)levellist->data;
+
am_level_t *alevel = (am_
level_t *)levellist->data;
newp->est[alevel->level].needestimate = 1;
newp->est[alevel->level].server = alevel->server;
levellist = g_slist_next(levellist);
newp->est[alevel->level].needestimate = 1;
newp->est[alevel->level].server = alevel->server;
levellist = g_slist_next(levellist);
@@
-1007,7
+1013,6
@@
generic_calc_estimates(
char *file_include = NULL;
times_t start_time;
FILE *dumpout = NULL;
char *file_include = NULL;
times_t start_time;
FILE *dumpout = NULL;
- off_t size = (off_t)1;
char *line = NULL;
char *match_expr;
amwait_t wait_status;
char *line = NULL;
char *match_expr;
amwait_t wait_status;
@@
-1097,7
+1102,7
@@
generic_calc_estimates(
}
match_expr = vstralloc(" %d SIZE %lld", NULL);
len = strlen(est->qamname);
}
match_expr = vstralloc(" %d SIZE %lld", NULL);
len = strlen(est->qamname);
- for(
size = (off_t)-1
; (line = agets(dumpout)) != NULL; free(line)) {
+ for(; (line = agets(dumpout)) != NULL; free(line)) {
long long size_ = (long long)0;
if (line[0] == '\0' || (int)strlen(line) <= len)
continue;
long long size_ = (long long)0;
if (line[0] == '\0' || (int)strlen(line) <= len)
continue;
@@
-1110,7
+1115,6
@@
generic_calc_estimates(
level,
size_);
}
level,
size_);
}
- size = (off_t)size_;
}
amfree(match_expr);
}
amfree(match_expr);