[Python-checkins] r43161 - python/trunk/Modules/audioop.c

Mon Mar 20 07:34:08 CET 2006

Author: neal.norwitz
Date: Mon Mar 20 07:34:06 2006
New Revision: 43161
Modified:
 python/trunk/Modules/audioop.c
Log:
Make some functions static, reformat function decl to be consistent and check for error from PyModule_GetDict()
Modified: python/trunk/Modules/audioop.c
==============================================================================

--- python/trunk/Modules/audioop.c	(original)
+++ python/trunk/Modules/audioop.c	Mon Mar 20 07:34:06 2006
@@ -50,7 +50,8 @@
 static PyInt16 seg_uend[8] = {0x3F, 0x7F, 0xFF, 0x1FF,
 0x3FF, 0x7FF, 0xFFF, 0x1FFF};
 
-static PyInt16 search(PyInt16 val, PyInt16 *table, int size)
+static PyInt16
+search(PyInt16 val, PyInt16 *table, int size)
 {
 int i;
 
@@ -63,7 +64,7 @@
 #define st_ulaw2linear16(uc) (_st_ulaw2linear16[uc])
 #define st_alaw2linear16(uc) (_st_alaw2linear16[uc])
 
-PyInt16 _st_ulaw2linear16[256] = {
+static PyInt16 _st_ulaw2linear16[256] = {
 -32124, -31100, -30076, -29052, -28028, -27004, -25980,
 -24956, -23932, -22908, -21884, -20860, -19836, -18812,
 -17788, -16764, -15996, -15484, -14972, -14460, -13948,
@@ -135,8 +136,8 @@
 * For further information see John C. Bellamy's Digital Telephony, 1982,
 * John Wiley & Sons, pps 98-111 and 472-476.
 */
-unsigned char st_14linear2ulaw(
- PyInt16 pcm_val) /* 2's complement (14-bit range) */
+static unsigned char
+st_14linear2ulaw(PyInt16 pcm_val)	/* 2's complement (14-bit range) */
 {
 PyInt16 mask;
 PyInt16 seg;
@@ -172,7 +173,7 @@
 
 }
 
-PyInt16 _st_alaw2linear16[256] = {
+static PyInt16 _st_alaw2linear16[256] = {
 -5504, -5248, -6016, -5760, -4480, -4224, -4992,
 -4736, -7552, -7296, -8064, -7808, -6528, -6272,
 -7040, -6784, -2752, -2624, -3008, -2880, -2240,
@@ -232,8 +233,8 @@
 * For further information see John C. Bellamy's Digital Telephony, 1982,
 * John Wiley & Sons, pps 98-111 and 472-476.
 */
-unsigned char st_linear2alaw(
- PyInt16 pcm_val) /* 2's complement (13-bit range) */
+static unsigned char
+st_linear2alaw(PyInt16 pcm_val)	/* 2's complement (13-bit range) */
 {
 PyInt16 mask;
 short seg;
@@ -1597,6 +1598,8 @@
 if (m == NULL)
 return;
 d = PyModule_GetDict(m);
+ if (d == NULL)
+ return;
 AudioopError = PyErr_NewException("audioop.error", NULL, NULL);
 if (AudioopError != NULL)
 PyDict_SetItemString(d,"error",AudioopError);
