981ef07d25e4560559dae28d3e316913569944d7 tdreszer Fri Jul 6 17:51:06 2012 -0700 Next batch of many checkins as dictated by Jim. Formatting space after if and limiting lines to 100 chars. Changes limited to lines last touched by tdreszer (git blame) so as not to ruin history. None of these changes should affect executables in any way. diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index 0f99ec1..49f34bf 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -1234,31 +1234,32 @@ char *path; safef(query, sizeof(query), "select path,size from %s where id = %u", extFileTable, extFileId); sr = sqlGetResult(conn, query); if ((row = sqlNextRow(sr)) == NULL) { errAbort("Database inconsistency table '%s.%s' no ext file with id %u", sqlGetDatabase(conn), extFileTable, extFileId); } path = cloneString(row[0]); dbSize = sqlLongLong(row[1]); diskSize = fileSize(path); if (dbSize != diskSize) { - errAbort("External file %s cannot be opened or has wrong size. Old size %lld, new size %lld, error %s", + errAbort("External file %s cannot be opened or has wrong size. " + "Old size %lld, new size %lld, error %s", path, dbSize, diskSize, strerror(errno)); } sqlFreeResult(&sr); return path; } char *hExtFileName(char *db, char *extFileTable, unsigned extFileId) /* Get external file name from table and ID. Typically * extFile table will be 'extFile' or 'gbExtFile' * Abort if the id is not in the table or if the file * fails size check. Please freeMem the result when you * are done with it. */ { struct sqlConnection *conn = hAllocConn(db);