Mercurial > hg > xmms-sid
diff src/xs_title.c @ 392:b09d74eb71e6
Working on getting STIL and SLDB using completely dynamically allocated
structures. Indentation cleanups, etc.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 31 May 2006 10:02:00 +0000 |
| parents | 29be09bd9397 |
| children | f997b79a7251 |
line wrap: on
line diff
--- a/src/xs_title.c Tue May 30 04:50:04 2006 +0000 +++ b/src/xs_title.c Wed May 31 10:02:00 2006 +0000 @@ -30,23 +30,25 @@ * Create a title string based on given information and settings. */ #define VPUTCH(MCH) \ -if (iIndex < XS_BUF_SIZE) tmpBuf[iIndex++] = MCH; + if (iIndex < XS_BUF_SIZE) tmpBuf[iIndex++] = MCH; + #define VPUTSTR(MSTR) { \ if (MSTR) { \ if ((iIndex + strlen(MSTR) + 1) < XS_BUF_SIZE) { \ strcpy(&tmpBuf[iIndex], MSTR); \ iIndex += strlen(MSTR); \ - } else \ + } else \ iIndex = XS_BUF_SIZE; \ - } \ - } + } \ +} gchar *xs_make_titlestring(gchar * pcFilename, gint iSubTune, gint nSubTunes, gint iSidModel, const gchar * formatString, const gchar * infoString0, const gchar * infoString1, const gchar * infoString2) { - gchar *tmpFilename, *tmpFilePath, *tmpFileExt, *pcStr, *pcResult, tmpStr[XS_BUF_SIZE], tmpBuf[XS_BUF_SIZE]; + gchar *tmpFilename, *tmpFilePath, *tmpFileExt, *pcStr, + *pcResult, tmpStr[XS_BUF_SIZE], tmpBuf[XS_BUF_SIZE]; gint iIndex; #ifdef HAVE_XMMSEXTRA TitleInput *ptInput;