[Asterisk-cvs] asterisk file.c,1.49,1.50

citats at lists.digium.com citats at lists.digium.com
Tue Sep 7 10:59:08 CDT 2004


Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk

Modified Files:
	file.c 
Log Message:
Formatting cleanups

Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- file.c	7 Sep 2004 14:36:56 -0000	1.49
+++ file.c	7 Sep 2004 15:01:48 -0000	1.50
@@ -480,7 +480,7 @@
 	res = ast_set_write_format(chan, fmts);
 	
  	fd = ast_filehelper(filename2, (char *)chan, NULL, ACTION_OPEN);
-	if(fd >= 0)
+	if (fd >= 0)
 		return chan->stream;
 	return NULL;
 }
@@ -522,7 +522,7 @@
 		return NULL;
 	}
  	fd = ast_filehelper(filename2, (char *)chan, fmt, ACTION_OPEN);
-	if(fd >= 0)
+	if (fd >= 0)
 		return chan->vstream;
 	ast_log(LOG_WARNING, "File %s has video but couldn't be opened\n", filename);
 	return NULL;
@@ -761,14 +761,14 @@
 	vfs = ast_openvstream(chan, filename, preflang);
 	if (vfs)
 		ast_log(LOG_DEBUG, "Ooh, found a video stream, too\n");
-	if(fs){
-		if(ast_applystream(chan, fs))
+	if (fs){
+		if (ast_applystream(chan, fs))
 			return -1;
-		if(vfs && ast_applystream(chan, vfs))
+		if (vfs && ast_applystream(chan, vfs))
 			return -1;
-		if(ast_playstream(fs))
+		if (ast_playstream(fs))
 			return -1;
-		if(vfs && ast_playstream(vfs))
+		if (vfs && ast_playstream(vfs))
 			return -1;
 #if 1
 		if (option_verbose > 2)
@@ -867,14 +867,15 @@
 				   What we are really doing is writing to record_cache_dir until we are done then we will mv the file into place.
 				*/
 				orig_fn = ast_strdupa(fn); 
-				for (size=0;size<strlen(fn);size++)
+				for (size=0;size<strlen(fn);size++) {
 					if (fn[size] == '/')
 						fn[size] = '_';
+				}
 
 				size += (strlen(record_cache_dir) + 10);
 				buf = alloca(size);
-				memset(buf,0,size);
-				snprintf(buf,size,"%s/%s",record_cache_dir,fn);
+				memset(buf, 0, size);
+				snprintf(buf, size, "%s/%s", record_cache_dir, fn);
 				free(fn);
 				fn=buf;
 				fd = open(fn, flags | myflags, mode);
@@ -889,8 +890,7 @@
 					if (option_cache_record_files) {
 						fs->realfilename = build_filename(filename, ext);
 						fs->filename = strdup(fn);
-					}
-					else {
+					} else {
 						fs->realfilename = NULL;
 						fs->filename = strdup(filename);
 					}
@@ -904,7 +904,7 @@
 				}
 			} else if (errno != EEXIST) {
 				ast_log(LOG_WARNING, "Unable to open file %s: %s\n", fn, strerror(errno));
-				if(orig_fn)
+				if (orig_fn)
 					unlink(orig_fn);
 			}
 			if (!buf) /* if buf != NULL then fn is already free and pointing to it */




More information about the svn-commits mailing list