May 25, 2018 updates: Privacy Policy
  • R/O
  • SSH
  • HTTPS

tsukurimashou: Commit


Commit MetaInfo

Revision671 (tree)
Time2018-04-06 02:54:03
Authormskala

Log Message

fix some compiler warnings, minor shape tweaks

Change Summary

Incremental Difference

--- trunk/icemap/fileout.c (revision 670)
+++ trunk/icemap/fileout.c (revision 671)
@@ -1,6 +1,6 @@
11 /*
22 * File output helpers
3- * Copyright (C) 2015 Matthew Skala
3+ * Copyright (C) 2015, 2018 Matthew Skala
44 *
55 * This program is free software: you can redistribute it and/or modify
66 * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
2020 */
2121
2222 #include <stdarg.h>
23+#include <stdio.h>
2324 #include <stdlib.h>
2425 #include <string.h>
2526 #include <unistd.h>
--- trunk/kleknev/wrapper.c (revision 670)
+++ trunk/kleknev/wrapper.c (revision 671)
@@ -1,6 +1,6 @@
11 /*
22 * Profiling wrapper for shell-based systems (shared code)
3- * Copyright (C) 2013, 2015 Matthew Skala
3+ * Copyright (C) 2013, 2015, 2018 Matthew Skala
44 *
55 * This program is free software: you can redistribute it and/or modify
66 * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
2828 #include <sys/resource.h>
2929 #include <sys/time.h>
3030 #include <sys/types.h>
31+#include <sys/wait.h>
3132 #include <time.h>
3233 #include <unistd.h>
3334
--- trunk/fontanvil/fontanvil/splinesave.c (revision 670)
+++ trunk/fontanvil/fontanvil/splinesave.c (revision 671)
@@ -1,6 +1,6 @@
1-/* $Id: splinesave.c 4532 2015-12-22 13:18:53Z mskala $ */
1+/* $Id: splinesave.c 5989 2018-04-05 17:42:29Z mskala $ */
22 /* Copyright (C) 2000-2012 George Williams
3- * Copyright (C) 2015 Matthew Skala
3+ * Copyright (C) 2015, 2018 Matthew Skala
44 *
55 * Redistribution and use in source and binary forms, with or without
66 * modification, are permitted provided that the following conditions are met:
@@ -718,41 +718,41 @@
718718 struct mhlist *mh;
719719 GrowBuf gb;
720720
721- for (mh=hdb->sublist; mh != NULL; mh=mh->next) {
722- if (memcmp(mask, mh->mask, sizeof(mask))==0)
723- return (mh->subr);
721+ for (mh=hdb->sublist;mh!=NULL;mh=mh->next) {
722+ if (memcmp(mask,mh->mask,sizeof(uint8_t)*12)==0)
723+ return (mh->subr);
724724 }
725725 SubrsCheck(hdb->subrs);
726726
727- memset(&gb, 0, sizeof(gb));
727+ memset(&gb,0,sizeof(gb));
728728 if (!hdb->scs[0]->hconflicts)
729- CvtPsHints(&gb, hdb->scs, hdb->instance_count, true, round, hdb->iscjk,
730- NULL);
729+ CvtPsHints(&gb,hdb->scs,hdb->instance_count,true,round,hdb->iscjk,
730+ NULL);
731731 else
732- CvtPsMasked(&gb, hdb->scs, hdb->instance_count, true, round, mask);
732+ CvtPsMasked(&gb,hdb->scs,hdb->instance_count,true,round,mask);
733733 if (!hdb->scs[0]->vconflicts)
734- CvtPsHints(&gb, hdb->scs, hdb->instance_count, false, round, hdb->iscjk,
735- NULL);
734+ CvtPsHints(&gb,hdb->scs,hdb->instance_count,false,round,hdb->iscjk,
735+ NULL);
736736 else
737- CvtPsMasked(&gb, hdb->scs, hdb->instance_count, false, round, mask);
738- if (gb.pt+1 >= gb.end)
739- GrowBuffer(&gb);
737+ CvtPsMasked(&gb,hdb->scs,hdb->instance_count,false,round,mask);
738+ if (gb.pt+1>=gb.end)
739+ GrowBuffer(&gb);
740740 *gb.pt++=11; /* return */
741741
742742 /* Replace an old subroutine */
743- if (mh != NULL) {
743+ if (mh!=NULL) {
744744 free(hdb->subrs->values[mh->subr]);
745- hdb->subrs->values[mh->subr] =
746- (uint8_t *) copyn((char *) gb.base, gb.pt-gb.base);
745+ hdb->subrs->values[mh->subr]=
746+ (uint8_t *)copyn((char *)gb.base,gb.pt-gb.base);
747747 hdb->subrs->lens[mh->subr]=gb.pt-gb.base;
748- memcpy(mh->mask, mask, sizeof(mh->mask));
748+ memcpy(mh->mask,mask,sizeof(mh->mask));
749749 } else {
750- hdb->subrs->values[hdb->subrs->next] =
751- (uint8_t *) copyn((char *) gb.base, gb.pt-gb.base);
750+ hdb->subrs->values[hdb->subrs->next]=
751+ (uint8_t *)copyn((char *)gb.base,gb.pt-gb.base);
752752 hdb->subrs->lens[hdb->subrs->next]=gb.pt-gb.base;
753753
754- mh=calloc(1, sizeof(struct mhlist));
755- memcpy(mh->mask, mask, sizeof(mh->mask));
754+ mh=calloc(1,sizeof(struct mhlist));
755+ memcpy(mh->mask,mask,sizeof(mh->mask));
756756 mh->subr=hdb->subrs->next++;
757757 mh->next=hdb->sublist;
758758 hdb->sublist=mh;
Show on old repository browser