mirror of
https://github.com/git/git.git
synced 2024-11-08 15:19:28 +01:00
diff: cast string constant in fill_textconv()
The `fill_textconv()` function is responsible for converting an input file with a textconv driver, which is then passed to the caller. Weirdly though, the function also handles the case where there is no textconv driver at all. In that case, it will return either the contents of the populated filespec, or an empty string if the filespec is invalid. These two cases have differing memory ownership semantics. When there is a textconv driver, then the result is an allocated string. Otherwise, the result is either a string constant or owned by the filespec struct. All callers are in fact aware of this weirdness and only end up freeing the output buffer when they had a textconv driver. Ideally, we'd split up this interface to only perform the conversion via the textconv driver, and BUG in case the caller didn't provide one. This would make memory ownership semantics much more straight forward. For now though, let's simply cast the empty string constant to `char *` to avoid a warning with `-Wwrite-strings`. This is equivalent to the same cast that we already have in `fill_mmfile()`. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
81654d27bf
commit
86badd4d0a
2
diff.c
2
diff.c
@ -7235,7 +7235,7 @@ size_t fill_textconv(struct repository *r,
|
||||
|
||||
if (!driver) {
|
||||
if (!DIFF_FILE_VALID(df)) {
|
||||
*outbuf = "";
|
||||
*outbuf = (char *) "";
|
||||
return 0;
|
||||
}
|
||||
if (diff_populate_filespec(r, df, NULL))
|
||||
|
Loading…
Reference in New Issue
Block a user