dmlib: tools/xm2jss.c comparison

comparison tools/xm2jss.c @ 1310:dce4730372c7

Add some blocks, cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 20 Aug 2017 01:01:12 +0300
parents	c44fcdc1c2e7
children	eb3f883f4acb

comparison

equal deleted inserted replaced

-:5ad7d780a09b
+:dce4730372c7
 size_t totalSize;
 int index;
 // Check the module
 if (module == NULL)
+{
 JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR,
 "Module pointer was NULL\n");
+}
 if (module->nchannels < 1 || module->npatterns < 1 || module->norders < 1 ||
 module->nchannels > jsetMaxChannels ||
 module->npatterns > jsetMaxPatterns ||
 module->norders > jsetMaxOrders)
+{
 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS,
 "Module had invalid values (nchannels=%d, npatterns=%d, norders=%d)\n",
 module->nchannels, module->npatterns, module->norders);
+}
 // Create the JSSMOD header
 jssH.idMagic[0]         = 'J';
 jssH.idMagic[1]         = 'M';
 jssH.idVersion          = JSSMOD_VERSION;
 !dm_fwrite_byte(outFile, jssH.nchannels) ||
 !dm_fwrite_byte(outFile, jssH.defSpeed) ||
 !dm_fwrite_byte(outFile, jssH.defTempo) ||
 !dm_fwrite_byte(outFile, jssH.patMode))
+{
 JSSERROR(DMERR_FWRITE, DMERR_FWRITE,
 "Error writing JSSMOD header!\n");
+}
 totalSize = sizeof(jssH);
 dmMsg(1," * JSSMOD-header 0x%04x, %d bytes.\n", JSSMOD_VERSION, totalSize);
 // Write orders list
 for (totalSize = index = 0; index < module->norders; index++)
 {
 int tmp = module->orderList[index];
 if (tmp != jsetNotSet && tmp > module->npatterns)
+{
 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA,
 "Orderlist entry #%d has invalid value %d.\n",
 index, tmp);
+}
 if (tmp == jsetNotSet)
 tmp = 0xffff;
 if (!dm_fwrite_le16(outFile, tmp))
 dmMsg(1," * %d item orders list, %d bytes.\n",
 module->norders, totalSize);
 // Allocate pattern compression buffer
 if ((patBuf = dmMalloc(patBufSize)) == NULL)
+{
 JSSERROR(DMERR_MALLOC, DMERR_MALLOC,
 "Error allocating memory for pattern compression buffer.\n");
+}
 // Convert and write patterns
 for (totalSize = index = 0; index < module->npatterns; index++)
 if (module->patterns[index] != NULL)
 {
 JSSPattern *pattern = module->patterns[index];
 size_t dataSize = 0;
 int ret;
 if (pattern->nrows > jsetMaxRows)
+{
 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA,
 "Pattern #%d has %d rows > %d max.\n",
 index, pattern->nrows, jsetMaxRows);
+}
 switch (patMode)
 {
 case PATMODE_RAW_HORIZ:
 ret = jssConvertPatternRawHoriz(patBuf, patBufSize, &dataSize, pattern);
 "Unsupported pattern conversion mode %d for pattern #%d.\n",
 patMode, index);
 }
 if (ret != DMERR_OK)
+{
 JSSERROR(ret, ret, "Error converting pattern data #%d.\n",
 pattern);
+}
 dmMsg(3, " - Pattern %d size %d bytes\n", index, dataSize);
 totalSize += dataSize + sizeof(JSSMODPattern);
 if (!dm_fwrite_le32(outFile, dataSize) ||
 !dm_fwrite_le16(outFile, pattern->nrows) ||
 !dm_fwrite_str(outFile, patBuf, dataSize))
+{
 JSSERROR(DMERR_FWRITE, DMERR_FWRITE,
 "Error writing JSSMOD pattern #%d.\n",
 index);
 }
-else
+}
+else
+{
 JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR,
 "Pattern #%d was NULL.\n", index);
+}
 dmFree(patBuf);
 dmMsg(1," * %d patterns, %d bytes.\n",
 module->npatterns, totalSize);
 }
 if (!ok ||
 !jssMODWriteEnvelope(outFile, &einst->volumeEnv, "volume", index) ||
 !jssMODWriteEnvelope(outFile, &einst->panningEnv, "panning", index))
+{
 JSSERROR(DMERR_FWRITE, DMERR_FWRITE,
 "Error writing JSSMOD extended instrument #%d.\n",
 index);
+}
 totalSize += sizeof(JSSMODExtInstrument);
 }
 else
+{
 JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR,
 "Extended instrument #%d NULL!\n",
 index);
+}
 dmMsg(1," * %d Extended Instruments, %d bytes.\n",
 module->nextInstruments, totalSize);
 // Write sample instrument headers
 !dm_fwrite_le16(outFile, inst->ERelNote) ||
 !dm_fwrite_le16(outFile, inst->EFineTune) ||
 !dm_fwrite_le16(outFile, inst->EPanning) ||
 !dm_fwrite_byte(outFile, inst->volume) ||
 !dm_fwrite_byte(outFile, inst->convFlags))
+{
 JSSERROR(DMERR_FWRITE, DMERR_FWRITE,
 "Error writing JSSMOD instrument #%d.\n",
 index);
+}
 totalSize += sizeof(JSSMODInstrument);
 }
 else
+{
 JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR,
 "Instrument #%d NULL!\n", index);
+}
 dmMsg(1," * %d Instrument headers, %d bytes.\n",
 module->ninstruments, totalSize);
 // Write sample data
 bsize *= sizeof(Uint8);
 jssEncodeSample8(inst->data, inst->size, flags8);
 }
 if (!dm_fwrite_str(outFile, inst->data, bsize))
+{
 JSSERROR(DMERR_FWRITE, DMERR_FWRITE,
 "Error writing JSSMOD sample data for instrument #%d.\n",
 index);
+}
 totalSize += bsize;
 }
 }

Mercurial > hg > dmlib

comparison tools/xm2jss.c @ 1310:dce4730372c7