keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Port rpmostree-output to C++

Browse Source 
Prep for using https://cxx.rs/
This commit is contained in:
Colin Walters 2020-12-18 18:17:11 +00:00 committed by OpenShift Merge Robot
parent baf395e9ed
commit 0571917254
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-libpriv.am
View File

@ -48,7 +48,7 @@ librpmostreepriv_la_SOURCES = \
src/libpriv/rpmostree-importer.h \
src/libpriv/rpmostree-unpacker-core.c \
src/libpriv/rpmostree-unpacker-core.h \
src/libpriv/rpmostree-output.c \
src/libpriv/rpmostree-output.cxx \
src/libpriv/rpmostree-output.h \
src/libpriv/rpmostree-editor.c \
src/libpriv/rpmostree-editor.h \

10
src/libpriv/rpmostree-output.c → src/libpriv/rpmostree-output.cxx
View File

@ -41,7 +41,7 @@ rpmostree_output_default_handler (RpmOstreeOutputType type,
break;
case RPMOSTREE_OUTPUT_PROGRESS_BEGIN:
{
RpmOstreeOutputProgressBegin *begin = data;
auto begin = static_cast<RpmOstreeOutputProgressBegin *>(data);
if (begin->percent)
ror_progress_begin_percent (begin->prefix);
else if (begin->n > 0)
@ -52,19 +52,19 @@ rpmostree_output_default_handler (RpmOstreeOutputType type,
break;
case RPMOSTREE_OUTPUT_PROGRESS_UPDATE:
{
RpmOstreeOutputProgressUpdate *upd = data;
auto upd = static_cast<RpmOstreeOutputProgressUpdate *>(data);
ror_progress_update (upd->c);
}
break;
case RPMOSTREE_OUTPUT_PROGRESS_SUB_MESSAGE:
{
const char *msg = data;
auto msg = static_cast<const char *>(data);
ror_progress_set_sub_message (msg);
}
break;
case RPMOSTREE_OUTPUT_PROGRESS_END:
{
RpmOstreeOutputProgressEnd *end = data;
auto end = static_cast<RpmOstreeOutputProgressEnd *>(data);
ror_progress_end (end->msg);
break;
}
@ -129,7 +129,7 @@ rpmostree_output_progress_end_msg (RpmOstreeProgress *taskp, const char *format,
void
rpmostree_output_progress_percent (int percentage)
{
RpmOstreeOutputProgressUpdate progress = { percentage };
RpmOstreeOutputProgressUpdate progress = { (guint)percentage };
active_cb (RPMOSTREE_OUTPUT_PROGRESS_UPDATE, &progress, active_cb_opaque);
}