emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_set_cb_xxx: simplify by using vars on the stack.

Browse Source
This commit is contained in:
Juan RP 2012-01-20 12:29:14 +01:00
parent d075411049
commit 3f9477417b
1 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lib/cb_util.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2011 Juan Romero Pardines. * Copyright (c) 2011-2012 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -50,24 +50,19 @@ xbps_set_cb_fetch(off_t file_size,
bool cb_end) bool cb_end)
{ {
const struct xbps_handle *xhp = xbps_handle_get(); const struct xbps_handle *xhp = xbps_handle_get();
struct xbps_fetch_cb_data *xfcd; struct xbps_fetch_cb_data xfcd;
if (xhp->fetch_cb == NULL) if (xhp->fetch_cb == NULL)
return; return;
xfcd = calloc(1, sizeof(*xfcd)); xfcd.file_size = file_size;
if (xfcd == NULL) xfcd.file_offset = file_offset;
return; xfcd.file_dloaded = file_dloaded;
xfcd.file_name = file_name;
xfcd->file_size = file_size; xfcd.cb_start = cb_start;
xfcd->file_offset = file_offset; xfcd.cb_update = cb_update;
xfcd->file_dloaded = file_dloaded; xfcd.cb_end = cb_end;
xfcd->file_name = file_name; (*xhp->fetch_cb)(&xfcd, xhp->fetch_cb_data);
xfcd->cb_start = cb_start;
xfcd->cb_update = cb_update;
xfcd->cb_end = cb_end;
(*xhp->fetch_cb)(xfcd, xhp->fetch_cb_data);
free(xfcd);
} }
void HIDDEN void HIDDEN
@ -78,7 +73,7 @@ xbps_set_cb_state(xbps_state_t state,
const char *fmt, const char *fmt,
...) ...)
{ {
struct xbps_state_cb_data *xscd; struct xbps_state_cb_data xscd;
const struct xbps_handle *xhp = xbps_handle_get(); const struct xbps_handle *xhp = xbps_handle_get();
char *buf = NULL; char *buf = NULL;
va_list va; va_list va;
@ -87,28 +82,22 @@ xbps_set_cb_state(xbps_state_t state,
if (xhp->state_cb == NULL) if (xhp->state_cb == NULL)
return; return;
xscd = calloc(1, sizeof(*xscd)); xscd.state = state;
if (xscd == NULL) xscd.err = err;
return; xscd.pkgname = pkgname;
xscd.version = version;
xscd->state = state;
xscd->err = err;
xscd->pkgname = pkgname;
xscd->version = version;
if (fmt != NULL) { if (fmt != NULL) {
va_start(va, fmt); va_start(va, fmt);
retval = vasprintf(&buf, fmt, va); retval = vasprintf(&buf, fmt, va);
va_end(va); va_end(va);
if (retval <= 0) if (retval <= 0)
xscd->desc = NULL; xscd.desc = NULL;
else else
xscd->desc = buf; xscd.desc = buf;
} }
(*xhp->state_cb)(xscd, xhp->fetch_cb_data); (*xhp->state_cb)(&xscd, xhp->fetch_cb_data);
if (buf != NULL) if (buf != NULL)
free(buf); free(buf);
free(xscd);
} }
void HIDDEN void HIDDEN
@ -120,21 +109,16 @@ xbps_set_cb_unpack(const char *entry,
bool entry_is_conf) bool entry_is_conf)
{ {
const struct xbps_handle *xhp = xbps_handle_get(); const struct xbps_handle *xhp = xbps_handle_get();
struct xbps_unpack_cb_data *xucd; struct xbps_unpack_cb_data xucd;
if (xhp->unpack_cb == NULL) if (xhp->unpack_cb == NULL)
return; return;
xucd = calloc(1, sizeof(*xucd)); xucd.entry = entry;
if (xucd == NULL) xucd.entry_size = entry_size;
return; xucd.entry_extract_count = entry_extract_count;
xucd.entry_total_count = entry_total_count;
xucd->entry = entry; xucd.entry_is_metadata = entry_is_metadata;
xucd->entry_size = entry_size; xucd.entry_is_conf = entry_is_conf;
xucd->entry_extract_count = entry_extract_count; (*xhp->unpack_cb)(&xucd, xhp->unpack_cb_data);
xucd->entry_total_count = entry_total_count;
xucd->entry_is_metadata = entry_is_metadata;
xucd->entry_is_conf = entry_is_conf;
(*xhp->unpack_cb)(xucd, xhp->unpack_cb_data);
free(xucd);
} }