Folded long lines.

gvanrossum · gvanrossum · commit cd037e7bed85 · 1999-03-24T19:05:31.000Z
diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
@@ -97,7 +97,8 @@ _PyBuffer_FromObject(base, offset, size, proc, readonly)
 
 	if ( (*pb->bf_getsegcount)(base, NULL) != 1 )
 	{
-		PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");
+		PyErr_SetString(PyExc_TypeError,
+				"single-segment buffer object expected");
 		return NULL;
 	}
 	if ( (count = (*proc)(base, 0, &p)) < 0 )
@@ -135,7 +136,8 @@ PyBuffer_FromObject(base, offset, size)
 		return NULL;
 	}
 
-	return _PyBuffer_FromObject(base, offset, size, pb->bf_getreadbuffer, 1);
+	return _PyBuffer_FromObject(base, offset, size,
+				    pb->bf_getreadbuffer, 1);
 }
 
 PyObject *
@@ -154,7 +156,9 @@ PyBuffer_FromReadWriteObject(base, offset, size)
 		return NULL;
 	}
 
-	return _PyBuffer_FromObject(base, offset, size, (getreadbufferproc)pb->bf_getwritebuffer, 0);
+	return _PyBuffer_FromObject(base, offset, size,
+				    (getreadbufferproc)pb->bf_getwritebuffer,
+				    0);
 }
 
 PyObject *
@@ -322,7 +326,8 @@ buffer_concat(self, other)
 	if ( (*pb->bf_getsegcount)(other, NULL) != 1 )
 	{
 		/* ### use a different exception type/message? */
-		PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");
+		PyErr_SetString(PyExc_TypeError,
+				"single-segment buffer object expected");
 		return NULL;
 	}
 
@@ -416,7 +421,8 @@ buffer_slice(self, left, right)
 	}
 	if ( right < left )
 		right = left;
-	return PyString_FromStringAndSize((char *)self->b_ptr + left, right - left);
+	return PyString_FromStringAndSize((char *)self->b_ptr + left,
+					  right - left);
 }
 
 static int
@@ -452,7 +458,8 @@ buffer_ass_item(self, idx, other)
 	if ( (*pb->bf_getsegcount)(other, NULL) != 1 )
 	{
 		/* ### use a different exception type/message? */
-		PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");
+		PyErr_SetString(PyExc_TypeError,
+				"single-segment buffer object expected");
 		return -1;
 	}
 
@@ -497,7 +504,8 @@ buffer_ass_slice(self, left, right, other)
 	if ( (*pb->bf_getsegcount)(other, NULL) != 1 )
 	{
 		/* ### use a different exception type/message? */
-		PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");
+		PyErr_SetString(PyExc_TypeError,
+				"single-segment buffer object expected");
 		return -1;
 	}
 	if ( (count = (*pb->bf_getreadbuffer)(other, 0, &p)) < 0 )
@@ -514,8 +522,9 @@ buffer_ass_slice(self, left, right, other)
 	slice_len = right - left;
 
 	if ( count != slice_len ) {
-		PyErr_SetString(PyExc_TypeError,
-				"right operand length must match slice length");
+		PyErr_SetString(
+			PyExc_TypeError,
+			"right operand length must match slice length");
 		return -1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ _PyBuffer_FromObject(base, offset, size, proc, readonly)`
`97`	`97`
`98`	`98`	`if ( (*pb->bf_getsegcount)(base, NULL) != 1 )`
`99`	`99`	`{`
`100`		`- PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");`
	`100`	`+ PyErr_SetString(PyExc_TypeError,`
	`101`	`+ "single-segment buffer object expected");`
`101`	`102`	`return NULL;`
`102`	`103`	`}`
`103`	`104`	`if ( (count = (*proc)(base, 0, &p)) < 0 )`
`@@ -135,7 +136,8 @@ PyBuffer_FromObject(base, offset, size)`
`135`	`136`	`return NULL;`
`136`	`137`	`}`
`137`	`138`
`138`		`- return _PyBuffer_FromObject(base, offset, size, pb->bf_getreadbuffer, 1);`
	`139`	`+ return _PyBuffer_FromObject(base, offset, size,`
	`140`	`+ pb->bf_getreadbuffer, 1);`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`PyObject *`
`@@ -154,7 +156,9 @@ PyBuffer_FromReadWriteObject(base, offset, size)`
`154`	`156`	`return NULL;`
`155`	`157`	`}`
`156`	`158`
`157`		`- return _PyBuffer_FromObject(base, offset, size, (getreadbufferproc)pb->bf_getwritebuffer, 0);`
	`159`	`+ return _PyBuffer_FromObject(base, offset, size,`
	`160`	`+ (getreadbufferproc)pb->bf_getwritebuffer,`
	`161`	`+ 0);`
`158`	`162`	`}`
`159`	`163`
`160`	`164`	`PyObject *`
`@@ -322,7 +326,8 @@ buffer_concat(self, other)`
`322`	`326`	`if ( (*pb->bf_getsegcount)(other, NULL) != 1 )`
`323`	`327`	`{`
`324`	`328`	`/* ### use a different exception type/message? */`
`325`		`- PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");`
	`329`	`+ PyErr_SetString(PyExc_TypeError,`
	`330`	`+ "single-segment buffer object expected");`
`326`	`331`	`return NULL;`
`327`	`332`	`}`
`328`	`333`
`@@ -416,7 +421,8 @@ buffer_slice(self, left, right)`
`416`	`421`	`}`
`417`	`422`	`if ( right < left )`
`418`	`423`	`right = left;`
`419`		`- return PyString_FromStringAndSize((char *)self->b_ptr + left, right - left);`
	`424`	`+ return PyString_FromStringAndSize((char *)self->b_ptr + left,`
	`425`	`+ right - left);`
`420`	`426`	`}`
`421`	`427`
`422`	`428`	`static int`
`@@ -452,7 +458,8 @@ buffer_ass_item(self, idx, other)`
`452`	`458`	`if ( (*pb->bf_getsegcount)(other, NULL) != 1 )`
`453`	`459`	`{`
`454`	`460`	`/* ### use a different exception type/message? */`
`455`		`- PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");`
	`461`	`+ PyErr_SetString(PyExc_TypeError,`
	`462`	`+ "single-segment buffer object expected");`
`456`	`463`	`return -1;`
`457`	`464`	`}`
`458`	`465`
`@@ -497,7 +504,8 @@ buffer_ass_slice(self, left, right, other)`
`497`	`504`	`if ( (*pb->bf_getsegcount)(other, NULL) != 1 )`
`498`	`505`	`{`
`499`	`506`	`/* ### use a different exception type/message? */`
`500`		`- PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected");`
	`507`	`+ PyErr_SetString(PyExc_TypeError,`
	`508`	`+ "single-segment buffer object expected");`
`501`	`509`	`return -1;`
`502`	`510`	`}`
`503`	`511`	`if ( (count = (*pb->bf_getreadbuffer)(other, 0, &p)) < 0 )`
`@@ -514,8 +522,9 @@ buffer_ass_slice(self, left, right, other)`
`514`	`522`	`slice_len = right - left;`
`515`	`523`
`516`	`524`	`if ( count != slice_len ) {`
`517`		`- PyErr_SetString(PyExc_TypeError,`
`518`		`- "right operand length must match slice length");`
	`525`	`+ PyErr_SetString(`
	`526`	`+ PyExc_TypeError,`
	`527`	`+ "right operand length must match slice length");`
`519`	`528`	`return -1;`
`520`	`529`	`}`
`521`	`530`