hostVolumeHeader.contd = 0;
volumeHeader_hton(&hostVolumeHeader, (struct volumeHeader *)buffer);
- rc = xbsa_WriteObjectData(&butxInfo, (struct volumeHeader *)buffer,
+ rc = xbsa_WriteObjectData(&butxInfo, buffer,
sizeof(struct volumeHeader), &bytesWritten);
if (rc != XBSA_SUCCESS) {
ErrorLog(1, taskId, rc, 0,
bytesWritten = sizeof(struct volumeHeader);
if (bytesWritten != sizeof(struct volumeHeader)) {
ErrorLog(1, taskId, rc, 0,
- "The size of VolumeHeader written (%d) does not equal its actual size (%d)\n",
+ "The size of VolumeHeader written (%d) does not equal its actual size (%" AFS_SIZET_FMT ")\n",
bytesWritten, sizeof(struct volumeHeader));
ERROR_EXIT(TC_INTERNALERROR);
}
hostVolumeHeader.contd = 0;
hostVolumeHeader.magic = TC_VOLENDMAGIC;
hostVolumeHeader.endTime = time(0);
- volumeHeader_hton(&hostVolumeHeader, &buffer[bytesread]);
+ volumeHeader_hton(&hostVolumeHeader, (struct volumeHeader *)&buffer[bytesread]);
bytesread += sizeof(hostVolumeHeader);
/* End the dump and transaction with the volserver. We end it now, before
switch (curDump->vtype) {
case BACKVOL:
- if (!(vldbEntry.flags & BACK_EXISTS)) {
+ if (!(vldbEntry.flags & VLF_BACKEXISTS)) {
ErrorLog(0, taskId, 0, 0,
"Volume %s (%u) failed - Backup volume no longer exists\n",
curDump->name, curDump->vid);
case RWVOL:
for (e = 0; e < vldbEntry.nServers; e++) { /* Find the RW volume */
- if (vldbEntry.serverFlags[e] & ITSRWVOL)
+ if (vldbEntry.serverFlags[e] & VLSF_RWVOL)
break;
}
break;
if (e >= vldbEntry.nServers) { /* Didn't find RO volume */
for (e = 0; e < vldbEntry.nServers; e++) { /* Find the first RO volume */
- if (vldbEntry.serverFlags[e] & ITSROVOL)
+ if (vldbEntry.serverFlags[e] & VLSF_ROVOL)
break;
}
}
int nodumpvolumes = 0;
char strlevel[5];
char msg[20];
- char finishedMsg1[50];
+ char finishedMsg1[128];
char finishedMsg2[50];
time_t startTime = 0;
time_t endTime = 0;
{
struct volumeHeader volHdr;
+ memset(&volHdr, 0, sizeof(volHdr));
+
strcpy(volHdr.preamble, hostPtr->preamble);
strcpy(volHdr.postamble, hostPtr->postamble);
strcpy(volHdr.volumeName, hostPtr->volumeName);
extern struct udbHandleS udbHandle;
extern struct deviceSyncNode *deviceLatch;
+ dumpid = ptr->dumpID;
+ taskId = ptr->taskId; /* Get task Id */
+
afs_pthread_setname_self("deletedump");
setStatus(taskId, DRIVE_WAIT);
EnterDeviceQueue(deviceLatch);
clearStatus(taskId, DRIVE_WAIT);
- dumpid = ptr->dumpID;
- taskId = ptr->taskId; /* Get task Id */
-
printf("\n\n");
TapeLog(2, taskId, 0, 0, "Delete Dump %u\n", dumpid);
code = BUTX_DELETENOVOL;
setStatus(taskId, TASK_ERROR);
}
- return (void *)(code);
+ return (void *)(uintptr_t)(code);
}
#endif