diff -r d0aa9e0a6d04 -r 6112bcc5d1cf librazor/razor-internal.h
--- a/librazor/razor-internal.h	Thu Feb 09 20:42:08 2012 +0000
+++ b/librazor/razor-internal.h	Sat Feb 11 23:50:26 2012 +0000
@@ -242,6 +242,23 @@
 wchar_t *razor_utf8_to_utf16(const char *utf8, int len);
 #endif
 
+/* Error functions */
+struct razor_error {
+	char *path;
+	char *str;
+	char *msg;
+};
+
+#ifdef MSWIN_API
+struct razor_error *razor_error_new_mswin(const wchar_t *path, DWORD error);
+#endif
+
+#if HAVE_WINDOWS_KTM
+struct razor_error *razor_error_new_str(const wchar_t *path, const char *str);
+#else
+struct razor_error *razor_error_new_str(const char *path, const char *str);
+#endif
+
 /* Atomic functions */
 
 #if HAVE_WINDOWS_KTM
@@ -253,9 +270,7 @@
 		HANDLE h;
 	} *files;
 	int in_undo;
-	char *error_path;
-	char *error_str;
-	char *error_msg;
+	struct razor_error *error;
 };
 #elif ENABLE_ATOMIC
 struct atomic_action {
@@ -298,9 +313,7 @@
 	char *toplevel;
 	unsigned next_file_tag;
 	int in_undo;
-	char *error_path;
-	char *error_str;
-	char *error_msg;
+	struct razor_error *error;
 };
 
 char *atomic_action_attic_tmpnam(struct razor_atomic *atomic);
@@ -317,29 +330,11 @@
 #else	/* !HAVE_WINDOWS_KTM && !ENABLE_ATOMIC */
 struct razor_atomic {
 	int in_undo;
-	char *error_path;
-	char *error_str;
-	char *error_msg;
+	struct razor_error *error;
 };
 #endif
 
 int razor_allow_all_root_names(void);
 int razor_valid_root_name(const char *name);
 
-#ifdef MSWIN_API
-void
-razor_atomic_set_error_mswin(struct razor_atomic *atomic, const wchar_t *path,
-			     DWORD error);
-#endif
-
-#if HAVE_WINDOWS_KTM
-void
-razor_atomic_set_error_str(struct razor_atomic *atomic, const wchar_t *path,
-			   const char *str);
-#else
-void
-razor_atomic_set_error_str(struct razor_atomic *atomic, const char *path,
-			   const char *str);
-#endif
-
 #endif /* _RAZOR_INTERNAL_H_ */