diff options
author | Elliott Hughes <enh@google.com> | 2016-04-25 14:31:18 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2016-04-29 08:30:13 -0700 |
commit | 2810d00dd95ed78fdd93f2ed68f06ee32bd8e1ac (patch) | |
tree | acbaf177a1f7c08e63a19a38ea4f5f8be5339333 /fastboot/engine.cpp | |
parent | d2afbe45e1ff50e38e907b0ca2fff3dbec3ba529 (diff) |
Use more std::string in fastboot.
Change-Id: Ic8c77eac1e0088627ab650050d9c97c5749e5c39
Diffstat (limited to 'fastboot/engine.cpp')
-rw-r--r-- | fastboot/engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fastboot/engine.cpp b/fastboot/engine.cpp index 47567c041..db5d0e0b2 100644 --- a/fastboot/engine.cpp +++ b/fastboot/engine.cpp @@ -351,21 +351,21 @@ int fb_execute_queue(Transport* transport) } if (a->op == OP_DOWNLOAD) { status = fb_download_data(transport, a->data, a->size); - status = a->func(a, status, status ? fb_get_error() : ""); + status = a->func(a, status, status ? fb_get_error().c_str() : ""); if (status) break; } else if (a->op == OP_COMMAND) { status = fb_command(transport, a->cmd); - status = a->func(a, status, status ? fb_get_error() : ""); + status = a->func(a, status, status ? fb_get_error().c_str() : ""); if (status) break; } else if (a->op == OP_QUERY) { status = fb_command_response(transport, a->cmd, resp); - status = a->func(a, status, status ? fb_get_error() : resp); + status = a->func(a, status, status ? fb_get_error().c_str() : resp); if (status) break; } else if (a->op == OP_NOTICE) { fprintf(stderr,"%s\n",(char*)a->data); } else if (a->op == OP_DOWNLOAD_SPARSE) { status = fb_download_data_sparse(transport, reinterpret_cast<sparse_file*>(a->data)); - status = a->func(a, status, status ? fb_get_error() : ""); + status = a->func(a, status, status ? fb_get_error().c_str() : ""); if (status) break; } else if (a->op == OP_WAIT_FOR_DISCONNECT) { transport->WaitForDisconnect(); |