comparison minijss/jloadxm.c @ 1256:d88d5f88b77a

Rename variable.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 09 Mar 2015 17:43:09 +0200
parents 47d8e5e0e592
children 60dc14a2e4c5
comparison
equal deleted inserted replaced
1255:f9bf71071f0b 1256:d88d5f88b77a
879 } 879 }
880 880
881 881
882 /* Load XM-format module from given file-stream 882 /* Load XM-format module from given file-stream
883 */ 883 */
884 int jssLoadXM(DMResource *inFile, JSSModule **ppModule, BOOL probe) 884 int jssLoadXM(DMResource *inFile, JSSModule **pmodule, BOOL probe)
885 { 885 {
886 JSSModule *module; 886 JSSModule *module;
887 XMHeader xmH; 887 XMHeader xmH;
888 int index, ret = DMERR_OK; 888 int index, ret = DMERR_OK;
889 889
890 assert(ppModule != NULL); 890 assert(pmodule != NULL);
891 assert(inFile != NULL); 891 assert(inFile != NULL);
892 *ppModule = NULL; 892 *pmodule = NULL;
893 893
894 // Try to get the XM-header 894 // Try to get the XM-header
895 if (!dmf_read_str(inFile, &xmH.idMagic, sizeof(xmH.idMagic)) || 895 if (!dmf_read_str(inFile, &xmH.idMagic, sizeof(xmH.idMagic)) ||
896 !dmf_read_str(inFile, &xmH.songName, sizeof(xmH.songName)) || 896 !dmf_read_str(inFile, &xmH.songName, sizeof(xmH.songName)) ||
897 !dmf_read_byte(inFile, &xmH.unUsed1A) || 897 !dmf_read_byte(inFile, &xmH.unUsed1A) ||
1012 1012
1013 if (probe) 1013 if (probe)
1014 return DMERR_OK; 1014 return DMERR_OK;
1015 1015
1016 // Okay, allocate a module structure 1016 // Okay, allocate a module structure
1017 if ((*ppModule = module = jssAllocateModule()) == NULL) 1017 if ((*pmodule = module = jssAllocateModule()) == NULL)
1018 { 1018 {
1019 JSSERROR(DMERR_MALLOC, DMERR_MALLOC, 1019 JSSERROR(DMERR_MALLOC, DMERR_MALLOC,
1020 "Could not allocate memory for module structure.\n"); 1020 "Could not allocate memory for module structure.\n");
1021 } 1021 }
1022 1022