diff options
Diffstat (limited to 'src/plugins/rpm_extractor.c')
-rw-r--r-- | src/plugins/rpm_extractor.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/rpm_extractor.c b/src/plugins/rpm_extractor.c index 90c5892..248217a 100644 --- a/src/plugins/rpm_extractor.c +++ b/src/plugins/rpm_extractor.c | |||
@@ -106,7 +106,7 @@ pipe_feeder (void *args) | |||
106 | while ( (0 == p->shutdown) && | 106 | while ( (0 == p->shutdown) && |
107 | (done < rret) ) | 107 | (done < rret) ) |
108 | { | 108 | { |
109 | if (-1 == (wret = WRITE (p->pi[1], | 109 | if (-1 == (wret = write (p->pi[1], |
110 | &buf[done], | 110 | &buf[done], |
111 | rret - done))) | 111 | rret - done))) |
112 | { | 112 | { |
@@ -119,7 +119,7 @@ pipe_feeder (void *args) | |||
119 | if (done != rret) | 119 | if (done != rret) |
120 | break; | 120 | break; |
121 | } | 121 | } |
122 | CLOSE (p->pi[1]); | 122 | close (p->pi[1]); |
123 | return NULL; | 123 | return NULL; |
124 | } | 124 | } |
125 | 125 | ||
@@ -272,8 +272,8 @@ EXTRACTOR_rpm_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
272 | return; | 272 | return; |
273 | if (0 != pthread_mutex_init (&parg.lock, NULL)) | 273 | if (0 != pthread_mutex_init (&parg.lock, NULL)) |
274 | { | 274 | { |
275 | CLOSE (parg.pi[0]); | 275 | close (parg.pi[0]); |
276 | CLOSE (parg.pi[1]); | 276 | close (parg.pi[1]); |
277 | return; | 277 | return; |
278 | } | 278 | } |
279 | if (0 != pthread_create (&pthr, | 279 | if (0 != pthread_create (&pthr, |
@@ -282,8 +282,8 @@ EXTRACTOR_rpm_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
282 | &parg)) | 282 | &parg)) |
283 | { | 283 | { |
284 | pthread_mutex_destroy (&parg.lock); | 284 | pthread_mutex_destroy (&parg.lock); |
285 | CLOSE (parg.pi[0]); | 285 | close (parg.pi[0]); |
286 | CLOSE (parg.pi[1]); | 286 | close (parg.pi[1]); |
287 | return; | 287 | return; |
288 | } | 288 | } |
289 | rpmlogSetCallback (&discard_log_callback, NULL); | 289 | rpmlogSetCallback (&discard_log_callback, NULL); |
@@ -416,7 +416,7 @@ END: | |||
416 | sig.sa_handler = SIG_IGN; | 416 | sig.sa_handler = SIG_IGN; |
417 | sigaction (SIGALRM, &sig, &old); | 417 | sigaction (SIGALRM, &sig, &old); |
418 | parg.shutdown = 1; | 418 | parg.shutdown = 1; |
419 | CLOSE (parg.pi[0]); | 419 | close (parg.pi[0]); |
420 | Fclose (fdi); | 420 | Fclose (fdi); |
421 | pthread_kill (pthr, SIGALRM); | 421 | pthread_kill (pthr, SIGALRM); |
422 | pthread_join (pthr, &unused); | 422 | pthread_join (pthr, &unused); |