[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c, 1.83, 1.84 logging.c, 1.13, 1.14

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv32753/libntfs

Modified Files:
	dir.c logging.c 
Log Message:
- mkntfs: Generate a random DCE compliant UUID for the created volume
  and include --with-uuid[=PFX] and --without-uuid options.  (Anton)
- configure.ac: Set language to C.  (Anton)
- mkntfs: Always set default cluster size to 4096 bytes regardless of
  volume size.  This is what Windows Vista does and it makes perfect
  sense from a performance point of view.  (Anton)


Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- dir.c	12 Dec 2006 15:02:25 -0000	1.83
+++ dir.c	13 Dec 2006 00:11:50 -0000	1.84
@@ -596,7 +596,6 @@ static const ntfschar dotdot[3] = { cons
 
 /**
  * ntfs_filldir - ntfs specific filldir method
- * @dir_ni:	ntfs inode of current directory
  * @pos:	current position in directory
  * @ie:		current index entry
  * @dirent:	context for filldir callback supplied by the caller
@@ -605,7 +604,7 @@ static const ntfschar dotdot[3] = { cons
  * Pass information specifying the current directory entry @ie to the @filldir
  * callback.
  */
-static int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, INDEX_ENTRY *ie,
+static int ntfs_filldir(s64 *pos, INDEX_ENTRY *ie,
 		void *dirent, ntfs_filldir_t filldir)
 {
 	FILE_NAME_ATTR *fn = &ie->key.file_name;
@@ -857,7 +856,7 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
 		 * Submit the directory entry to ntfs_filldir(), which will
 		 * invoke the filldir() callback as appropriate.
 		 */
-		rc = ntfs_filldir(dir_ni, pos, ie, dirent, filldir);
+		rc = ntfs_filldir(pos, ie, dirent, filldir);
 		if (rc) {
 			ntfs_attr_put_search_ctx(ctx);
 			ctx = NULL;
@@ -1018,7 +1017,7 @@ find_next_index_buffer:
 		 * Submit the directory entry to ntfs_filldir(), which will
 		 * invoke the filldir() callback as appropriate.
 		 */
-		rc = ntfs_filldir(dir_ni, pos, ie, dirent, filldir);
+		rc = ntfs_filldir(pos, ie, dirent, filldir);
 		if (rc)
 			goto done;
 	}

Index: logging.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/logging.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- logging.c	1 Nov 2006 14:05:09 -0000	1.13
+++ logging.c	13 Dec 2006 00:11:50 -0000	1.14
@@ -71,18 +71,20 @@ struct ntfs_logging {
 /**
  * ntfs_log - This struct controls all the logging in the library and tools.
  */
-static struct ntfs_logging ntfs_log = {
+static struct ntfs_logging ntfs_log = (struct ntfs_logging) {
+	.levels = NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET |
+			NTFS_LOG_LEVEL_WARNING | NTFS_LOG_LEVEL_ERROR |
+			NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
+			NTFS_LOG_LEVEL_PROGRESS |
 #ifdef DEBUG
-	NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE |
+			NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE |
 #endif
-	NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET | NTFS_LOG_LEVEL_WARNING |
-	NTFS_LOG_LEVEL_ERROR | NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
-	NTFS_LOG_LEVEL_PROGRESS,
-	NTFS_LOG_FLAG_ONLYNAME,
+			0,
+	.flags = NTFS_LOG_FLAG_ONLYNAME,
 #ifdef DEBUG
-	ntfs_log_handler_outerr
+	.handler = ntfs_log_handler_outerr,
 #else
-	ntfs_log_handler_null
+	.handler = ntfs_log_handler_null,
 #endif
 };
 
@@ -343,8 +345,10 @@ int ntfs_log_redirect(const char *functi
 
 #ifdef HAVE_SYSLOG_H
 int ntfs_log_handler_syslog(const char *function  __attribute__((unused)),
-	const char *file, __attribute__((unused)) int line, u32 level,
-	void *data __attribute__((unused)), const char *format, va_list args)
+		const char *file, int line __attribute__((unused)),
+		u32 level __attribute__((unused)),
+		void *data __attribute__((unused)), const char *format,
+		va_list args)
 {
 	int ret = 0;
 	int olderr = errno;