Browse Source

Merge branch 'ep/equals-null-cocci'

Merges up ep/maint-equals-null-cocci to the current codebase.

* ep/equals-null-cocci:
  tree-wide: apply equals-null.cocci
maint
Junio C Hamano 3 years ago
parent
commit
e121c8c0d9
  1. 2
      branch.c
  2. 2
      compat/fsmonitor/fsm-listen-darwin.c

2
branch.c

@ -653,7 +653,7 @@ void create_branches_recursively(struct repository *r, const char *name,
* be created in every submodule. * be created in every submodule.
*/ */
for (i = 0; i < submodule_entry_list.entry_nr; i++) { for (i = 0; i < submodule_entry_list.entry_nr; i++) {
if (submodule_entry_list.entries[i].repo == NULL) { if (!submodule_entry_list.entries[i].repo) {
int code = die_message( int code = die_message(
_("submodule '%s': unable to find submodule"), _("submodule '%s': unable to find submodule"),
submodule_entry_list.entries[i].submodule->name); submodule_entry_list.entries[i].submodule->name);

2
compat/fsmonitor/fsm-listen-darwin.c

@ -342,7 +342,7 @@ int fsm_listen__ctor(struct fsmonitor_daemon_state *state)
data->cfar_paths_to_watch, data->cfar_paths_to_watch,
kFSEventStreamEventIdSinceNow, kFSEventStreamEventIdSinceNow,
0.001, flags); 0.001, flags);
if (data->stream == NULL) if (!data->stream)
goto failed; goto failed;


/* /*

Loading…
Cancel
Save