resolve.h File Reference

resolve action header file. More...

#include "global.h"
#include "actions.h"

Include dependency graph for resolve.h:

This graph shows which files directly or indirectly include this file:

Go to the source code of this file.

Functions
int	res__mark_conflict (struct estat *sts,...) __attribute((sentinel))
	This function takes a NULL terminated list of filenames, and appends it to the conflict list of the given sts.
int	res__remove_aux_files (struct estat *sts)
	Removes all stored files.
Variables
work_t	res__work
	Resolve command main function.
action_t	res__action
	Resolve command action function.

---

Detailed Description

resolve action header file.

Definition in file resolve.h.

---

Function Documentation

int res__mark_conflict	(	struct estat *	sts,
			...
	)

This function takes a NULL terminated list of filenames, and appends it to the conflict list of the given sts.

This function takes a NULL terminated list of filenames, and appends it to the conflict list of the given sts.

The conflict flag must be set by this function, so that it knows whether it has to purge any (wrongly) pre-existing cflct file or to just append.

Definition at line 52 of file resolve.c.

References filename, estat::flags, ops__build_path(), RF_CONFLICT, STOPIF, STOPIF_CODE_ERR, WAA__APPEND, waa__close(), WAA__CONFLICT_EXT, waa__open_byext(), and WAA__WRITE.

Referenced by rev___undo_change(), and rev__merge().

Here is the call graph for this function:

Here is the caller graph for this function:

int res__remove_aux_files

(

struct estat *

sts

)

Removes all stored files.

Definition at line 123 of file resolve.c.

References BUG_ON, filename, estat::flags, hlp__fstat(), ops__build_path(), RF_CONFLICT, sstat_t::size, STOPIF, STOPIF_CODE_ERR, waa__close(), WAA__CONFLICT_EXT, waa__delete_byext(), waa__open_byext(), and WAA__READ.

Referenced by res__action(), and rev___revert_to_base().

Here is the call graph for this function:

Here is the caller graph for this function:

---

Variable Documentation

action_t res__action

Resolve command action function.

Definition at line 29 of file resolve.h.

work_t res__work

Resolve command main function.

Definition at line 26 of file resolve.h.