int res_all_size = sizeof(res_all);
/* Definition of records permitted within each
- * resource with the routine to process the record
+ * resource with the routine to process the record
* information.
- */
+ */
/* Globals for the Storage daemon. */
static RES_ITEM store_items[] = {
{"requiressl", store_yesno,ITEM(res_store.require_ssl), 1, ITEM_DEFAULT, 0},
{"maximumconcurrentjobs", store_pint, ITEM(res_store.max_concurrent_jobs), 0, ITEM_DEFAULT, 10},
{"heartbeatinterval", store_time, ITEM(res_store.heartbeat_interval), 0, ITEM_DEFAULT, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, 0, 0, 0, 0}
};
{"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
{"enablessl", store_yesno, ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
{"monitor", store_yesno, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, 0, 0, 0, 0}
};
/* Device definition */
{"maximumspoolsize", store_size, ITEM(res_dev.max_spool_size), 0, 0, 0},
{"maximumjobspoolsize", store_size, ITEM(res_dev.max_job_spool_size), 0, 0, 0},
{"driveindex", store_pint, ITEM(res_dev.drive_index), 0, 0, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, 0, 0, 0, 0}
};
// {"mountanonymousvolumes", store_yesno, ITEM(res_dev.cap_bits), CAP_ANONVOLS, ITEM_DEFAULT, 0},
break;
case R_STORAGE:
sendit(sock, "Storage: name=%s SDaddr=%s SDport=%d SDDport=%d HB=%s\n",
- res->res_store.hdr.name,
+ res->res_store.hdr.name,
NPRT(get_first_address(res->res_store.sdaddrs, buf, sizeof(buf))),
- get_first_port_host_order(res->res_store.sdaddrs),
+ get_first_port_host_order(res->res_store.sdaddrs),
get_first_port_host_order(res->res_store.sddaddrs),
edit_utime(res->res_store.heartbeat_interval, buf, sizeof(buf)));
foreach_dlist(p, res->res_store.sdaddrs) {
- sendit(sock, " SDaddr=%s SDport=%d\n",
+ sendit(sock, " SDaddr=%s SDport=%d\n",
p->get_address(buf, sizeof(buf)), p->get_port_host_order());
}
foreach_dlist(p, res->res_store.sddaddrs) {
- sendit(sock, " SDDaddr=%s SDDport=%d\n",
+ sendit(sock, " SDDaddr=%s SDDport=%d\n",
p->get_address(buf, sizeof(buf)), p->get_port_host_order());
}
break;
res->res_dev.hdr.name,
res->res_dev.media_type, res->res_dev.device_name);
sendit(sock, " rew_wait=%d min_bs=%d max_bs=%d\n",
- res->res_dev.max_rewind_wait, res->res_dev.min_block_size,
+ res->res_dev.max_rewind_wait, res->res_dev.min_block_size,
res->res_dev.max_block_size);
sendit(sock, " max_jobs=%d max_files=%" lld " max_size=%" lld "\n",
res->res_dev.max_volume_jobs, res->res_dev.max_volume_files,
res->res_dev.max_spool_size, res->res_dev.max_job_spool_size);
strcpy(buf, " ");
if (res->res_dev.cap_bits & CAP_EOF) {
- bstrncat(buf, "CAP_EOF ", sizeof(buf));
+ bstrncat(buf, "CAP_EOF ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_BSR) {
- bstrncat(buf, "CAP_BSR ", sizeof(buf));
+ bstrncat(buf, "CAP_BSR ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_BSF) {
- bstrncat(buf, "CAP_BSF ", sizeof(buf));
+ bstrncat(buf, "CAP_BSF ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_FSR) {
- bstrncat(buf, "CAP_FSR ", sizeof(buf));
+ bstrncat(buf, "CAP_FSR ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_FSF) {
- bstrncat(buf, "CAP_FSF ", sizeof(buf));
+ bstrncat(buf, "CAP_FSF ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_EOM) {
- bstrncat(buf, "CAP_EOM ", sizeof(buf));
+ bstrncat(buf, "CAP_EOM ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_REM) {
- bstrncat(buf, "CAP_REM ", sizeof(buf));
+ bstrncat(buf, "CAP_REM ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_RACCESS) {
- bstrncat(buf, "CAP_RACCESS ", sizeof(buf));
+ bstrncat(buf, "CAP_RACCESS ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_AUTOMOUNT) {
- bstrncat(buf, "CAP_AUTOMOUNT ", sizeof(buf));
+ bstrncat(buf, "CAP_AUTOMOUNT ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_LABEL) {
- bstrncat(buf, "CAP_LABEL ", sizeof(buf));
+ bstrncat(buf, "CAP_LABEL ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_ANONVOLS) {
- bstrncat(buf, "CAP_ANONVOLS ", sizeof(buf));
+ bstrncat(buf, "CAP_ANONVOLS ", sizeof(buf));
}
if (res->res_dev.cap_bits & CAP_ALWAYSOPEN) {
- bstrncat(buf, "CAP_ALWAYSOPEN ", sizeof(buf));
+ bstrncat(buf, "CAP_ALWAYSOPEN ", sizeof(buf));
}
bstrncat(buf, "\n", sizeof(buf));
sendit(sock, buf);
break;
case R_MSGS:
sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
- if (res->res_msgs.mail_cmd)
- sendit(sock, " mailcmd=%s\n", res->res_msgs.mail_cmd);
- if (res->res_msgs.operator_cmd)
- sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
+ if (res->res_msgs.mail_cmd)
+ sendit(sock, " mailcmd=%s\n", res->res_msgs.mail_cmd);
+ if (res->res_msgs.operator_cmd)
+ sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
break;
default:
sendit(sock, _("Warning: unknown resource type %d\n"), type);
dump_resource(type, (RES *)res->res_dir.hdr.next, sendit, sock);
}
-/*
- * Free memory of resource.
+/*
+ * Free memory of resource.
* NB, we don't need to worry about freeing any references
- * to other resources as they will be freed when that
+ * to other resources as they will be freed when that
* resource chain is traversed. Mainly we worry about freeing
* allocated strings (names).
*/
res = NULL;
break;
default:
- Dmsg1(0, "Unknown resource type %d\n", type);
+ Dmsg1(0, "Unknown resource type %d\n", type);
break;
}
/* Common stuff again -- free the resource, recurse to next one */
int i, size;
int error = 0;
- /*
+ /*
* Ensure that all required items are present
*/
for (i=0; items[i].name; i++) {
if (items[i].flags & ITEM_REQUIRED) {
- if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {
- Emsg2(M_ERROR_TERM, 0, _("\"%s\" item is required in \"%s\" resource, but not found.\n"),
+ if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {
+ Emsg2(M_ERROR_TERM, 0, _("\"%s\" item is required in \"%s\" resource, but not found.\n"),
items[i].name, resources[rindex]);
}
}
/* If this triggers, take a look at lib/parse_conf.h */
if (i >= MAX_RES_ITEMS) {
- Emsg1(M_ERROR_TERM, 0, _("Too many items in \"%s\" resource\n"), resources[rindex]);
+ Emsg1(M_ERROR_TERM, 0, _("Too many items in \"%s\" resource\n"), resources[rindex]);
}
}
/* Resources containing a resource */
case R_STORAGE:
if ((res = (URES *)GetResWithName(R_STORAGE, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ERROR_TERM, 0, "Cannot find Storage resource \"%s\"\n", res_all.res_dir.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, "Cannot find Storage resource \"%s\"\n", res_all.res_dir.hdr.name);
}
res->res_store.messages = res_all.res_store.messages;
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf("Unknown resource type %d\n", type);
error = 1;
break;
}
size = sizeof(DEVRES);
break;
case R_MSGS:
- size = sizeof(MSGS);
+ size = sizeof(MSGS);
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf("Unknown resource type %d\n", type);
error = 1;
size = 1;
break;
for (next=res_head[rindex]; next->next; next=next->next) {
if (strcmp(next->name, res->res_dir.hdr.name) == 0) {
Emsg2(M_ERROR_TERM, 0,
- _("Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n"),
+ _("Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n"),
resources[rindex].name, res->res_dir.hdr.name);
}
}
next->next = (RES *)res;
- Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
+ Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
res->res_dir.hdr.name);
}
}
projects / bacula / bacula / blobdiff