socsvn commit: r254892 - soc2013/dpl/head/contrib/xz/src/xz

[dpl at FreeBSD.org]

Author: dpl
Date: Wed Jul 17 17:43:31 2013
New Revision: 254892
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254892

Log:
  Just commiting to have the latest version, so I can comment about the code with my mentor.
  

Modified:
  soc2013/dpl/head/contrib/xz/src/xz/file_io.c
  soc2013/dpl/head/contrib/xz/src/xz/main.c

Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/file_io.c	Wed Jul 17 17:36:07 2013	(r254891)
+++ soc2013/dpl/head/contrib/xz/src/xz/file_io.c	Wed Jul 17 17:43:31 2013	(r254892)
@@ -980,7 +980,7 @@
 io_open_files(char *filename[], int files)
 {
 	int i;
-	file_pair **pairs = (file_pair **)malloc(files * sizeof(file_pair *));
+	file_pair **pairs = (file_pair **)malloc(sizeof(file_pair **));
 
 	if( opt_mode == MODE_LIST)
 		if (opt_format != FORMAT_XZ && opt_format != FORMAT_AUTO)
@@ -1007,6 +1007,7 @@
 			opt_force = true;
 		}
 
+		pairs[i] = (file_pair*)malloc(sizeof(file_pair *));
 		pairs[i] = io_open_src(filename[i]);
 		if( opt_mode != MODE_TEST )
 			io_open_dest(pairs[i]);

Modified: soc2013/dpl/head/contrib/xz/src/xz/main.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/main.c	Wed Jul 17 17:36:07 2013	(r254891)
+++ soc2013/dpl/head/contrib/xz/src/xz/main.c	Wed Jul 17 17:43:31 2013	(r254892)
@@ -255,24 +255,22 @@
 		// check it as loop termination condition.
 		while (true) {
 			char *name = read_name(&args);
-			printf("name: %s\n", name);
 			if (name == NULL)
 				break;
 
 			// read_name() doesn't return empty names.
 			assert(name[0] != '\0');
-			args.arg_count++;
 			args.arg_names[nfiles] = name;
+			printf("args.args_names[%d]: %s\n", nfiles, args.arg_names[nfiles]);
 			nfiles++;
+			args.arg_count++;
 		}
-
 		if (args.files_name != stdin_filename)
 			(void)fclose(args.files_file);
 	}
 
-	printf("nfiles: %d\n", nfiles);
-	for ( i = 0; (size_t)i < args.arg_count; i++)
-		printf("file: %s\n", args.arg_names[i]);
+	for ( i = 0; i < nfiles; i++)
+		printf("file[%d]: %s\n", i, args.arg_names[i]);
 
 	file_pair **pairs = io_open_files(args.arg_names, nfiles);