#include "bacula.h"
#include "stored.h"
-extern int debug_level;
-
-
/* First and last resource ids */
int r_first = R_FIRST;
int r_last = R_LAST;
/* We build the current resource here statically,
* then move it to dynamic memory */
+#if defined(_MSC_VER)
+extern "C" { // work around visual compiler mangling variables
+ URES res_all;
+}
+#else
URES res_all;
+#endif
int res_all_size = sizeof(res_all);
/* Definition of records permitted within each
{"tlskey", store_dir, ITEM(res_store.tls_keyfile), 0, 0, 0},
{"tlsdhfile", store_dir, ITEM(res_store.tls_dhfile), 0, 0, 0},
{"tlsallowedcn", store_alist_str, ITEM(res_store.tls_allowed_cns), 0, 0, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, {0}, 0, 0, 0}
};
{"tlskey", store_dir, ITEM(res_dir.tls_keyfile), 0, 0, 0},
{"tlsdhfile", store_dir, ITEM(res_dir.tls_dhfile), 0, 0, 0},
{"tlsallowedcn", store_alist_str, ITEM(res_dir.tls_allowed_cns), 0, 0, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, {0}, 0, 0, 0}
};
/* Device definition */
{"changerdevice", store_strname,ITEM(res_dev.changer_name), 0, 0, 0},
{"changercommand", store_strname,ITEM(res_dev.changer_command), 0, 0, 0},
{"alertcommand", store_strname,ITEM(res_dev.alert_command), 0, 0, 0},
- {"maximumchangerwait", store_pint, ITEM(res_dev.max_changer_wait), 0, ITEM_DEFAULT, 5 * 60},
- {"maximumopenwait", store_pint, ITEM(res_dev.max_open_wait), 0, ITEM_DEFAULT, 5 * 60},
+ {"maximumchangerwait", store_time, ITEM(res_dev.max_changer_wait), 0, ITEM_DEFAULT, 5 * 60},
+ {"maximumopenwait", store_time, ITEM(res_dev.max_open_wait), 0, ITEM_DEFAULT, 5 * 60},
{"maximumopenvolumes", store_pint, ITEM(res_dev.max_open_vols), 0, ITEM_DEFAULT, 1},
{"maximumnetworkbuffersize", store_pint, ITEM(res_dev.max_network_buffer_size), 0, 0, 0},
{"volumepollinterval", store_time, ITEM(res_dev.vol_poll_interval), 0, 0, 0},
- {"maximumrewindwait", store_pint, ITEM(res_dev.max_rewind_wait), 0, ITEM_DEFAULT, 5 * 60},
+ {"maximumrewindwait", store_time, ITEM(res_dev.max_rewind_wait), 0, ITEM_DEFAULT, 5 * 60},
{"minimumblocksize", store_pint, ITEM(res_dev.min_block_size), 0, 0, 0},
{"maximumblocksize", store_pint, ITEM(res_dev.max_block_size), 0, 0, 0},
{"maximumvolumesize", store_size, ITEM(res_dev.max_volume_size), 0, 0, 0},
{"writepartcommand", store_strname,ITEM(res_dev.write_part_command), 0, 0, 0},
{"freespacecommand", store_strname,ITEM(res_dev.free_space_command), 0, 0, 0},
{"labeltype", store_label, ITEM(res_dev.label_type), 0, 0, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, {0}, 0, 0, 0}
};
/* Autochanger definition */
{"device", store_alist_res, ITEM(res_changer.device), R_DEVICE, ITEM_REQUIRED, 0},
{"changerdevice", store_strname, ITEM(res_changer.changer_name), 0, ITEM_REQUIRED, 0},
{"changercommand", store_strname, ITEM(res_changer.changer_command), 0, ITEM_REQUIRED, 0},
- {NULL, NULL, 0, 0, 0, 0}
+ {NULL, NULL, {0}, 0, 0, 0}
};
res->res_dev.hdr.name,
res->res_dev.media_type, res->res_dev.device_name,
res->res_dev.label_type);
- sendit(sock, " rew_wait=%d min_bs=%d max_bs=%d chgr_wait=%d\n",
+ sendit(sock, " rew_wait=%" lld " min_bs=%d max_bs=%d chgr_wait=%" lld "\n",
res->res_dev.max_rewind_wait, res->res_dev.min_block_size,
res->res_dev.max_block_size, res->res_dev.max_changer_wait);
sendit(sock, " max_jobs=%d max_files=%" lld " max_size=%" lld "\n",