diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-03-27 18:50:04 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-03-27 18:50:04 +0200 |
| commit | 8e0684b5d4b69670797d9d297a317aacd7236548 (patch) | |
| tree | 9eaafb090247ce9b08015c90ac1062f4a10acca9 /src/core/lib/iomgr/load_file.c | |
| parent | b02dd01584e21565ebea173ceee7568404d23f2b (diff) | |
| parent | c4478a103b68100b86f506061cedcb0ce70016ba (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness
Diffstat (limited to 'src/core/lib/iomgr/load_file.c')
| -rw-r--r-- | src/core/lib/iomgr/load_file.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/load_file.c b/src/core/lib/iomgr/load_file.c index f40c8b28cc..208f74e20c 100644 --- a/src/core/lib/iomgr/load_file.c +++ b/src/core/lib/iomgr/load_file.c @@ -78,9 +78,12 @@ end: *output = result; if (file != NULL) fclose(file); if (error != GRPC_ERROR_NONE) { - grpc_error *error_out = grpc_error_set_str( - GRPC_ERROR_CREATE_REFERENCING("Failed to load file", &error, 1), - GRPC_ERROR_STR_FILENAME, filename); + grpc_error *error_out = + grpc_error_set_str(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Failed to load file", &error, 1), + GRPC_ERROR_STR_FILENAME, + grpc_slice_from_copied_string( + filename)); // TODO(ncteisen), always static? GRPC_ERROR_UNREF(error); error = error_out; } |