Whitespace

src/ioutil.c

@@ -34,10 +34,10 @@ struct bitset_mapping* build_allocation_map(int fd, uint64_t size, int resolutio
 	/* Resize fiemap to allow us to read in the extents */
 	fiemap = (struct fiemap*)xmalloc(
 			sizeof(struct fiemap) + (
-				sizeof(struct fiemap_extent) * 
+				sizeof(struct fiemap_extent) *
 				fiemap_count->fm_mapped_extents
 				)
-			); 
+			);
 
 	/* realloc makes valgrind complain a lot */
 	memcpy(fiemap, fiemap_count, sizeof(struct fiemap));
@@ -46,15 +46,15 @@ struct bitset_mapping* build_allocation_map(int fd, uint64_t size, int resolutio
 	fiemap->fm_extent_count = fiemap->fm_mapped_extents;
 	fiemap->fm_mapped_extents = 0;
 
-	if (ioctl(fd, FS_IOC_FIEMAP, fiemap) < 0) { 
+	if (ioctl(fd, FS_IOC_FIEMAP, fiemap) < 0) {
 		debug( "Couldn't get fiemap, returning no allocation_map" );
 		goto no_map;
 	}
 
 	for (i=0;i<fiemap->fm_mapped_extents;i++) {
 		bitset_set_range(
-			allocation_map, 
-			fiemap->fm_extents[i].fe_logical, 
+			allocation_map,
+			fiemap->fm_extents[i].fe_logical,
 			fiemap->fm_extents[i].fe_length
 		);
 	}
@@ -94,7 +94,7 @@ no_map:
 int open_and_mmap(const char* filename, int* out_fd, off64_t *out_size, void **out_map)
 {
 	off64_t size;
-	
+
 	/* O_DIRECT seems to be intermittently supported.  Leaving it as
 	 * a compile-time option for now. */
 #ifdef DIRECT_IO
@@ -107,7 +107,7 @@ int open_and_mmap(const char* filename, int* out_fd, off64_t *out_size, void **o
 		warn("open(%s) failed: does it exist?", filename);
 		return *out_fd;
 	}
-	
+
 	size = lseek64(*out_fd, 0, SEEK_END);
 	if (size < 0) {
 		warn("lseek64() failed");
@@ -116,9 +116,9 @@ int open_and_mmap(const char* filename, int* out_fd, off64_t *out_size, void **o
 	if (out_size) {
 		*out_size = size;
 	}
-	
+
 	if (out_map) {
-		*out_map = mmap64(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, 
+		*out_map = mmap64(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED,
 		  *out_fd, 0);
 		if (((long) *out_map) == -1) {
 			warn("mmap64() failed");
@@ -126,7 +126,7 @@ int open_and_mmap(const char* filename, int* out_fd, off64_t *out_size, void **o
 		}
 	}
 	debug("opened %s size %ld on fd %d @ %p", filename, size, *out_fd, *out_map);
-	
+
 	return 0;
 }
 
@@ -175,16 +175,16 @@ ssize_t spliceloop(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_
 {
 	const unsigned int flags = SPLICE_F_MORE|SPLICE_F_MOVE|flags2;
 	size_t spliced=0;
-	
+
 	//debug("spliceloop(%d, %ld, %d, %ld, %ld)", fd_in, off_in ? *off_in : 0, fd_out, off_out ? *off_out : 0, len);
-	
+
 	while (spliced < len) {
 		ssize_t result = splice(fd_in, off_in, fd_out, off_out, len, flags);
 		if (result < 0) {
 			//debug("result=%ld (%s), spliced=%ld, len=%ld", result, strerror(errno), spliced, len);
 			if (errno == EAGAIN && (flags & SPLICE_F_NONBLOCK) ) {
 				return spliced;
-			} 
+			}
 			else {
 				return -1;
 			}
@@ -193,7 +193,7 @@ ssize_t spliceloop(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_
 			//debug("result=%ld (%s), spliced=%ld, len=%ld", result, strerror(errno), spliced, len);
 		}
 	}
-	
+
 	return spliced;
 }
 
@@ -202,25 +202,25 @@ int splice_via_pipe_loop(int fd_in, int fd_out, size_t len)
 
 	int pipefd[2]; /* read end, write end */
 	size_t spliced=0;
-	
+
 	if (pipe(pipefd) == -1) {
 		return -1;
 	}
-	
+
 	while (spliced < len) {
 		ssize_t run = len-spliced;
 		ssize_t s2, s1 = spliceloop(fd_in, NULL, pipefd[1], NULL, run, SPLICE_F_NONBLOCK);
 		/*if (run > 65535)
 			run = 65535;*/
 		if (s1 < 0) { break; }
-		
+
 		s2 = spliceloop(pipefd[0], NULL, fd_out, NULL, s1, 0);
 		if (s2 < 0) { break; }
 		spliced += s2;
 	}
 	close(pipefd[0]);
 	close(pipefd[1]);
-	
+
 	return spliced < len ? -1 : 0;
 }
 
@@ -234,16 +234,16 @@ int splice_via_pipe_loop(int fd_in, int fd_out, size_t len)
 int read_until_newline(int fd, char* buf, int bufsize)
 {
 	int cur;
-	
+
 	for (cur=0; cur < bufsize; cur++) {
 		int result = read(fd, buf+cur, 1);
 		if (result <= 0) { return -1; }
-		if (buf[cur] == 10) { 
+		if (buf[cur] == 10) {
 			buf[cur] = '\0';
-			break; 
+			break;
 		}
 	}
-	
+
 	return cur+1;
 }
 
@@ -252,9 +252,9 @@ int read_lines_until_blankline(int fd, int max_line_length, char ***lines)
 	int lines_count = 0;
 	char line[max_line_length+1];
 	*lines = NULL;
-	
+
 	memset(line, 0, max_line_length+1);
-	
+
 	while (1) {
 		int readden = read_until_newline(fd, line, max_line_length);
 		/* readden will be:
@@ -280,3 +280,4 @@ int fd_is_closed( int fd_in )
 	errno = errno_old;
 	return result;
 }
+