Fix conio.h problem on Solaris

[bacula/bacula] / bacula / src / dird / recycle.c

diff --git a/bacula/src/dird/recycle.c b/bacula/src/dird/recycle.c
index 44e4945a0fb18b2c4dc3fd46cbe60f645dd768dd..84a39a9dc4ba4bcc48b75e4272f5e37071b0f157 100644 (file)
--- a/bacula/src/dird/recycle.c
+++ b/bacula/src/dird/recycle.c
@@ -57,7 +57,7 @@ int find_recycled_volume(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
    if (db_find_next_volume(jcr, jcr->db, 1, InChanger, mr)) {
       jcr->MediaId = mr->MediaId;
       Dmsg1(20, "Find_next_vol MediaId=%u\n", jcr->MediaId);
-      pm_strcpy(&jcr->VolumeName, mr->VolumeName);
+      pm_strcpy(jcr->VolumeName, mr->VolumeName);
       return 1;
    }
    return 0;
@@ -80,9 +80,9 @@ int recycle_oldest_purged_volume(JCR *jcr, bool InChanger, MEDIA_DBR *mr)
    Dmsg0(100, "Enter recycle_oldest_purged_volume\n");
    oldest.MediaId = 0;
    if (InChanger) {
-      Mmsg(&query, select, mr->PoolId, mr->MediaType, "AND InChanger=1 ");
+      Mmsg(query, select, mr->PoolId, mr->MediaType, "AND InChanger=1 ");
    } else {
-      Mmsg(&query, select, mr->PoolId, mr->MediaType, "");
+      Mmsg(query, select, mr->PoolId, mr->MediaType, "");
    }
 
    if (!db_sql_query(jcr->db, query, oldest_handler, (void *)&oldest)) {