src/format.cc

changeset 73
1ee9b312dc18
parent 72
03e4d9db3fd9
child 75
bf8c57437231
--- a/src/format.cc	Fri Jan 10 21:58:42 2014 +0200
+++ b/src/format.cc	Sat Jan 11 22:36:31 2014 +0200
@@ -1,3 +1,33 @@
+/*
+	Copyright (c) 2013-2014, Santeri Piippo
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+		* Redistributions of source code must retain the above copyright
+		  notice, this list of conditions and the following disclaimer.
+
+		* Redistributions in binary form must reproduce the above copyright
+		  notice, this list of conditions and the following disclaimer in the
+		  documentation and/or other materials provided with the distribution.
+
+		* Neither the name of the <organization> nor the
+		  names of its contributors may be used to endorse or promote products
+		  derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 #include <cstdio>
 #include "main.h"
 #include "format.h"
@@ -41,13 +71,13 @@
 		char mod = '\0';
 
 		// handle modifiers
-		if (fmt[ pos + ofs ] == 's' || fmt[ pos + ofs ] == 'x')
+		if (fmt[pos + ofs] == 's' || fmt[pos + ofs] == 'x')
 		{
 			mod = fmt[ pos + ofs ];
 			ofs++;
 		}
 
-		if (!isdigit (fmt[ pos + ofs ]))
+		if (!isdigit (fmt[pos + ofs]))
 		{
 			fprintf (stderr, "bad format string, expected digit with optional "
 					 "modifier after '%%':\n");
@@ -55,7 +85,7 @@
 			return fmt;
 		}
 
-		int i = fmt[ pos + ofs ]  - '0';
+		int i = fmt[pos + ofs]  - '0';
 
 		if (i >= args.size())
 		{
@@ -91,4 +121,4 @@
 {
 	string out = format_args (args);
 	fprintf (fp, "%s", out.chars());
-}
+}
\ No newline at end of file

mercurial