From ca213bebf2f234dafe51041384c858b0aa887e18 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 4 Jun 2011 21:20:30 +0200 Subject: [PATCH] Eliminate some old bnet code --- bacula/src/stored/bscan.c | 4 ++-- bacula/src/tools/testfind.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c index 0605796019..e987feb0b4 100644 --- a/bacula/src/stored/bscan.c +++ b/bacula/src/stored/bscan.c @@ -865,11 +865,11 @@ static void bscan_free_jcr(JCR *jcr) if (jcr->file_bsock) { Dmsg0(200, "Close File bsock\n"); - bnet_close(jcr->file_bsock); + jcr->file_bsock->close(); } if (jcr->store_bsock) { Dmsg0(200, "Close Store bsock\n"); - bnet_close(jcr->store_bsock); + jcr->store_bsock->close(); } if (jcr->RestoreBootstrap) { free(jcr->RestoreBootstrap); diff --git a/bacula/src/tools/testfind.c b/bacula/src/tools/testfind.c index b32230cbd6..eb8f10c14c 100644 --- a/bacula/src/tools/testfind.c +++ b/bacula/src/tools/testfind.c @@ -488,15 +488,15 @@ static bool copy_fileset(FF_PKT *ff, JCR *jcr) set_options(current_opts, fo->opts); for (k=0; kregex.size(); k++) { - // bnet_fsend(fd, "R %s\n", fo->regex.get(k)); + // fd->fsend("R %s\n", fo->regex.get(k)); current_opts->regex.append(bstrdup((const char *)fo->regex.get(k))); } for (k=0; kregexdir.size(); k++) { - // bnet_fsend(fd, "RD %s\n", fo->regexdir.get(k)); + // fd->fsend("RD %s\n", fo->regexdir.get(k)); current_opts->regexdir.append(bstrdup((const char *)fo->regexdir.get(k))); } for (k=0; kregexfile.size(); k++) { - // bnet_fsend(fd, "RF %s\n", fo->regexfile.get(k)); + // fd->fsend("RF %s\n", fo->regexfile.get(k)); current_opts->regexfile.append(bstrdup((const char *)fo->regexfile.get(k))); } for (k=0; kwild.size(); k++) { -- 2.39.5