Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 672668
Collapse All | Expand All

(-)a/cltypes.h (+1 lines)
Line 0 Link Here
1
/* around clamav-0.101.0 */
(-)a/src/skyldav/VirusScan.cc (-1 / +12 lines)
Lines 236-241 void VirusScan::releaseEngine() { Link Here
236
    pthread_mutex_unlock(&mutexEngine);
236
    pthread_mutex_unlock(&mutexEngine);
237
}
237
}
238
238
239
#ifndef CL_SCAN_STDOPT
240
const struct cl_scan_options options = {
241
.general = CL_SCAN_GENERAL_ALLMATCHES,
242
.parse = ~0
243
};
244
#endif
245
239
/**
246
/**
240
 * @brief Scans file for virus.
247
 * @brief Scans file for virus.
241
 *
248
 *
Lines 244-252 void VirusScan::releaseEngine() { Link Here
244
int VirusScan::scan(const int fd) {
251
int VirusScan::scan(const int fd) {
245
    int success = SCANOK;
252
    int success = SCANOK;
246
    int ret;
253
    int ret;
247
    const char *virname;
254
    const char *virname = NULL;
248
255
256
#ifdef CL_SCAN_STDOPT
249
    ret = cl_scandesc(fd, &virname, NULL, getEngine(), CL_SCAN_STDOPT);
257
    ret = cl_scandesc(fd, &virname, NULL, getEngine(), CL_SCAN_STDOPT);
258
#else
259
    ret = cl_scandesc(fd, NULL, &virname, NULL, getEngine(), &options);
260
#endif
250
    switch (ret) {
261
    switch (ret) {
251
        case CL_CLEAN:
262
        case CL_CLEAN:
252
            success = SCANOK;
263
            success = SCANOK;

Return to bug 672668