Menu
▾
▴
[Bacula-commits] bacula/src/lib attr.c, 1.19, 1.20 bpipe.c, 1.45, 1.46 btime.c, 1.23, 1.24 scan.c, 1.17, 1.18
|
From: Kern S. <ke...@us...> - 2006-09-02 17:18:10
|
Update of /cvsroot/bacula/bacula/src/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17006/src/lib Modified Files: attr.c bpipe.c btime.c scan.c Log Message: kes When doing a label, pass the VolBytes back to the Director, which puts it in the catalog. kes Print an error message if the user attempts to prune an archived Volume. kes Need to start using %ld when sscanfing 32 bit values. kes Update the free kes Correct the counting of VolCatBytes for DVDs. kes Add code to mount.c to require that VolCatBytes corresponds to what is actually found when doing an append. kes Update freespace only after writing on the DVD. kes Remove code that blows away the current part in the spool file. Index: scan.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/lib/scan.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- scan.c 17 Mar 2006 17:42:43 -0000 1.17 +++ scan.c 2 Sep 2006 17:18:08 -0000 1.18 @@ -339,7 +339,9 @@ } vp = (void *)va_arg(ap, void *); // Dmsg2(000, "val=%lld at 0x%lx\n", value, (long unsigned)vp); - if (l < 2) { + if (l == 0) { + *((int *)vp) = (int)value; + } else if (l == 1) { *((uint32_t *)vp) = (uint32_t)value; // Dmsg0(000, "Store 32 bit int\n"); } else { Index: bpipe.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/lib/bpipe.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- bpipe.c 30 Aug 2006 16:19:31 -0000 1.45 +++ bpipe.c 2 Sep 2006 17:18:08 -0000 1.46 @@ -247,7 +247,7 @@ stop_child_timer(bpipe->timer_id); } free(bpipe); - Dmsg2(200, "returning stat=%d,%d\n", stat & ~(b_errno_exit|b_errno_signal), stat); + Dmsg2(800, "returning stat=%d,%d\n", stat & ~(b_errno_exit|b_errno_signal), stat); return stat; } Index: attr.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/lib/attr.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- attr.c 3 Jul 2006 18:28:36 -0000 1.19 +++ attr.c 2 Sep 2006 17:18:08 -0000 1.20 @@ -59,7 +59,7 @@ */ attr->stream = stream; Dmsg1(400, "Attr: %s\n", rec); - if (sscanf(rec, "%d %d", &attr->file_index, &attr->type) != 2) { + if (sscanf(rec, "%ld %ld", &attr->file_index, &attr->type) != 2) { Jmsg(jcr, M_FATAL, 0, _("Error scanning attributes: %s\n"), rec); Dmsg1(100, "\nError scanning attributes. %s\n", rec); return 0; Index: btime.c =================================================================== RCS file: /cvsroot/bacula/bacula/src/lib/btime.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- btime.c 30 Jun 2006 04:06:31 -0000 1.23 +++ btime.c 2 Sep 2006 17:18:08 -0000 1.24 @@ -4,22 +4,17 @@ * Version $Id$ */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2000-2006 Kern Sibbald This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License + version 2 as amended with additional clauses defined in the + file LICENSE in the main source directory. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -34,8 +29,8 @@ * and is 1 Jan 1970 at 0:0 UTC * * The major two times that should be left are: - * btime_t (64 bit integer in microseconds base Epoch) - * utime_t (64 bit integer in seconds base Epoch) + * btime_t (64 bit integer in microseconds base Epoch) + * utime_t (64 bit integer in seconds base Epoch) */ #include "bacula.h" @@ -111,7 +106,7 @@ time_t ttime; if (sscanf(str, "%d-%d-%d %d:%d:%d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, - &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { + &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { return 0; } if (tm.tm_mon > 0) { @@ -168,7 +163,7 @@ */ int tm_wom(int mday, int wday) { - int fs; /* first sunday */ + int fs; /* first sunday */ fs = (mday%7) - wday; if (fs <= 0) { fs += 7; @@ -234,7 +229,7 @@ } -/* date_encode -- Encode civil date as a Julian day number. */ +/* date_encode -- Encode civil date as a Julian day number. */ /* Deprecated. Do not use. */ fdate_t date_encode(uint32_t year, uint8_t month, uint8_t day) @@ -252,44 +247,44 @@ y = year; if (m <= 2) { - y--; - m += 12; + y--; + m += 12; } /* Determine whether date is in Julian or Gregorian calendar based on canonical date of calendar reform. */ if ((year < 1582) || ((year == 1582) && ((month < 9) || (month == 9 && day < 5)))) { - b = 0; + b = 0; } else { - a = ((int) (y / 100)); - b = 2 - a + (a / 4); + a = ((int) (y / 100)); + b = 2 - a + (a / 4); } return (((int32_t) (365.25 * (y + 4716))) + ((int) (30.6001 * (m + 1))) + - day + b - 1524.5); + day + b - 1524.5); } /* time_encode -- Encode time from hours, minutes, and seconds - into a fraction of a day. */ + into a fraction of a day. */ /* Deprecated. Do not use. */ ftime_t time_encode(uint8_t hour, uint8_t minute, uint8_t second, - float32_t second_fraction) + float32_t second_fraction) { ASSERT((second_fraction >= 0.0) || (second_fraction < 1.0)); return (ftime_t) (((second + 60L * (minute + 60L * hour)) / 86400.0)) + - second_fraction; + second_fraction; } /* date_time_encode -- Set day number and fraction from date - and time. */ + and time. */ /* Deprecated. Do not use. */ void date_time_encode(struct date_time *dt, - uint32_t year, uint8_t month, uint8_t day, - uint8_t hour, uint8_t minute, uint8_t second, - float32_t second_fraction) + uint32_t year, uint8_t month, uint8_t day, + uint8_t hour, uint8_t minute, uint8_t second, + float32_t second_fraction) { dt->julian_day_number = date_encode(year, month, day); dt->julian_day_fraction = time_encode(hour, minute, second, second_fraction); @@ -299,7 +294,7 @@ /* Deprecated. Do not use. */ void date_decode(fdate_t date, uint32_t *year, uint8_t *month, - uint8_t *day) + uint8_t *day) { fdate_t z, f, a, alpha, b, c, d, e; @@ -308,10 +303,10 @@ f = date - z; if (z < 2299161.0) { - a = z; + a = z; } else { - alpha = floor((z - 1867216.25) / 36524.25); - a = z + 1 + alpha - floor(alpha / 4); + alpha = floor((z - 1867216.25) / 36524.25); + a = z + 1 + alpha - floor(alpha / 4); } b = a + 1524; @@ -328,7 +323,7 @@ /* Deprecated. Do not use. */ void time_decode(ftime_t time, uint8_t *hour, uint8_t *minute, - uint8_t *second, float32_t *second_fraction) + uint8_t *second, float32_t *second_fraction) { uint32_t ij; @@ -337,30 +332,30 @@ *minute = (uint8_t) ((ij / 60L) % 60L); *second = (uint8_t) (ij % 60L); if (second_fraction != NULL) { - *second_fraction = (float32_t)(time - floor(time)); + *second_fraction = (float32_t)(time - floor(time)); } } /* date_time_decode -- Decode a Julian day and day fraction - into civil date and time. */ + into civil date and time. */ /* Deprecated. Do not use. */ void date_time_decode(struct date_time *dt, - uint32_t *year, uint8_t *month, uint8_t *day, - uint8_t *hour, uint8_t *minute, uint8_t *second, - float32_t *second_fraction) + uint32_t *year, uint8_t *month, uint8_t *day, + uint8_t *hour, uint8_t *minute, uint8_t *second, + float32_t *second_fraction) { date_decode(dt->julian_day_number, year, month, day); time_decode(dt->julian_day_fraction, hour, minute, second, second_fraction); } /* tm_encode -- Encode a civil date and time from a tm structure - * to a Julian day and day fraction. + * to a Julian day and day fraction. */ /* Deprecated. Do not use. */ void tm_encode(struct date_time *dt, - struct tm *tm) + struct tm *tm) { uint32_t year; uint8_t month, day, hour, minute, second; @@ -377,11 +372,11 @@ /* tm_decode -- Decode a Julian day and day fraction - into civil date and time in tm structure */ + into civil date and time in tm structure */ /* Deprecated. Do not use. */ void tm_decode(struct date_time *dt, - struct tm *tm) + struct tm *tm) { uint32_t year; uint8_t month, day, hour, minute, second; @@ -398,21 +393,21 @@ /* date_time_compare -- Compare two dates and times and return - the relationship as follows: + the relationship as follows: - -1 dt1 < dt2 - 0 dt1 = dt2 - 1 dt1 > dt2 + -1 dt1 < dt2 + 0 dt1 = dt2 + 1 dt1 > dt2 */ /* Deprecated. Do not use. */ int date_time_compare(struct date_time *dt1, struct date_time *dt2) { if (dt1->julian_day_number == dt2->julian_day_number) { - if (dt1->julian_day_fraction == dt2->julian_day_fraction) { - return 0; - } - return (dt1->julian_day_fraction < dt2->julian_day_fraction) ? -1 : 1; + if (dt1->julian_day_fraction == dt2->julian_day_fraction) { + return 0; + } + return (dt1->julian_day_fraction < dt2->julian_day_fraction) ? -1 : 1; } return (dt1->julian_day_number - dt2->julian_day_number) ? -1 : 1; } |