head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.42 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.40 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.38 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.32 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.30 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.28 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.26 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.24 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.22 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.20 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2; locks; strict; comment @# @; 1.2 date 2005.03.23.22.11.57; author markd; state dead; branches; next 1.1; 1.1 date 2005.02.20.11.31.11; author markd; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.02.20.11.31.11; author snj; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2005.02.20.18.45.05; author snj; state Exp; branches; next ; desc @@ 1.2 log @Update to KDE 3.4 Highlights at a glance * Text-to-speech system with support built into Konqueror, Kate, KPDF and the standalone application KSayIt * Support for text to speech synthesis is integrated with the desktop * Completely redesigned, more flexible trash system * Kicker with improved look and feel * KPDF now enables you to select, copy & paste text and images from PDFs, along with many other improvements * Kontact supports now various groupware servers, including eGroupware, GroupWise, Kolab, OpenGroupware.org and SLOX * Kopete supports Novell Groupwise and Lotus Sametime and gets integrated into Kontact * DBUS/HAL support allows to keep dynamic device icons in media:/ and on the desktop in sync with the state of all devices * KHTML has improved standard support and now close to full support for CSS 2.1 and the CSS 3 Selectors module * Better synchronization between 2 PCs * A new high contrast style and a complete monochrome icon set * An icon effect to paint all icons in two chosen colors, converting third party application icons into high contrast monochrome icons * Akregator allows you to read news from your favourite RSS-enabled websites in one application * Juk has now an album cover management via Google Image Search * KMail now stores passwords securely with KWallet * SVG files can now be used as wallpapers * KHTML plug-ins are now configurable, so the user can selectively disable ones that are not used. This does not include Netscape-style plug-ins. Netscape plug-in in CPU usage can be manually lowered, and plug-ins are more stable. * more than 6,500 bugs have been fixed * more than 1,700 wishes have been fullfilled * more than 80,000 contributions with several million lines of code and documentation added or changed @ text @$NetBSD: patch-aj,v 1.1 2005/02/20 11:31:11 markd Exp $ --- kstars/kstars/indi/fli_ccd.c.orig 2004-10-03 20:13:39.000000000 +1300 +++ kstars/kstars/indi/fli_ccd.c @@@@ -51,9 +51,9 @@@@ void getBasicData(void); void initDataChannel(void); void waitForData(int rp, int wp); void updateDataChannel(void *p); -void uploadFile(char * filename); +void uploadFile(const char* filename); int findPort(void); -int writeFITS(char *filename, char errmsg[]); +int writeFITS(const char* filename, char errmsg[]); int findcam(flidomain_t domain); int setImageArea(char errmsg[]); int manageDefaults(char errmsg[]); @@@@ -419,7 +419,7 @@@@ void ISNewNumber (const char *dev, const long err; int i; INumber *np; - char errmsg[1024]; + char errmsg[ERRMSG_SIZE]; /* ignore if not ours */ if (dev && strcmp (dev, mydev)) @@@@ -556,14 +556,14 @@@@ void ISNewNumber (const char *dev, const if (nset < 4) { - IDSetNumber(&FrameNP, "Invalid range. Valid range is (0,0) - (%0.f,%0.f)", FLICam->width, FLICam->height); - IDLog("Invalid range. Valid range is (0,0) - (%0.f,%0.f)", FLICam->width, FLICam->height); + IDSetNumber(&FrameNP, "Invalid range. Valid range is (0,0) - (%0d,%0d)", FLICam->width, FLICam->height); + IDLog("Invalid range. Valid range is (0,0) - (%0d,%0d)", FLICam->width, FLICam->height); return; } if (setImageArea(errmsg)) { - IDSetNumber(&FrameNP, errmsg); + IDSetNumber(&FrameNP, "%s", errmsg); return; } @@@@ -600,8 +600,8 @@@@ void ISNewNumber (const char *dev, const { if (values[i] < 1 || values[i] > MAX_X_BIN) { - IDSetNumber(&BinningNP, "Error: Valid X bin values are from 1 to %d", MAX_X_BIN); - IDLog("Error: Valid X bin values are from 1 to %d", MAX_X_BIN); + IDSetNumber(&BinningNP, "Error: Valid X bin values are from 1 to %g", MAX_X_BIN); + IDLog("Error: Valid X bin values are from 1 to %g", MAX_X_BIN); return; } @@@@ -618,8 +618,8 @@@@ void ISNewNumber (const char *dev, const { if (values[i] < 1 || values[i] > MAX_Y_BIN) { - IDSetNumber(&BinningNP, "Error: Valid Y bin values are from 1 to %d", MAX_Y_BIN); - IDLog("Error: Valid X bin values are from 1 to %d", MAX_Y_BIN); + IDSetNumber(&BinningNP, "Error: Valid Y bin values are from 1 to %g", MAX_Y_BIN); + IDLog("Error: Valid X bin values are from 1 to %g", MAX_Y_BIN); return; } @@@@ -637,7 +637,7 @@@@ void ISNewNumber (const char *dev, const if (setImageArea(errmsg)) { IDSetNumber(&BinningNP, errmsg, NULL); - IDLog(errmsg); + IDLog("%s", errmsg); return; } @@@@ -817,8 +817,8 @@@@ int setImageArea(char errmsg[]) if ( (err = FLISetImageArea(fli_dev, x_1, y_1, x_2, y_2) )) { - sprintf(errmsg, "FLISetImageArea() failed. %s.\n", strerror((int)-err)); - IDLog(errmsg, NULL); + snprintf(errmsg, ERRMSG_SIZE, "FLISetImageArea() failed. %s.\n", strerror((int)-err)); + IDLog("%s", errmsg); return -1; } @@@@ -832,13 +832,13 @@@@ int grabImage() { long err; int img_size,i, fd; - char errmsg[1024]; + char errmsg[ERRMSG_SIZE]; char filename[] = "/tmp/fitsXXXXXX"; if ((fd = mkstemp(filename)) < 0) { - IDMessage(mydev, "Error making temporary filename.", NULL); - IDLog("Error making temporary filename.\n", NULL); + IDMessage(mydev, "Error making temporary filename."); + IDLog("Error making temporary filename.\n"); return -1; } close(fd); @@@@ -849,8 +849,8 @@@@ int grabImage() if (FLIImg->img == NULL) { - IDMessage(mydev, "Not enough memory to store image.", NULL); - IDLog("Not enough memory to store image.\n", NULL); + IDMessage(mydev, "Not enough memory to store image."); + IDLog("Not enough memory to store image.\n"); return -1; } @@@@ -880,7 +880,7 @@@@ int grabImage() } -int writeFITS(char *filename, char errmsg[]) +int writeFITS(const char* filename, char errmsg[]) { FITS_FILE* ofp; int i, j, bpp, bpsl, width, height; @@@@ -890,7 +890,7 @@@@ int writeFITS(char *filename, char errms ofp = fits_open (filename, "w"); if (!ofp) { - sprintf(errmsg, "Error: cannot open file for writing."); + snprintf(errmsg, ERRMSG_SIZE, "Error: cannot open file for writing."); return (-1); } @@@@ -903,12 +903,12 @@@@ int writeFITS(char *filename, char errms hdu = create_fits_header (ofp, width, height, bpp); if (hdu == NULL) { - sprintf(errmsg, "Error: creating FITS header failed."); + snprintf(errmsg, ERRMSG_SIZE, "Error: creating FITS header failed."); return (-1); } if (fits_write_header (ofp, hdu) < 0) { - sprintf(errmsg, "Error: writing to FITS header failed."); + snprintf(errmsg, ERRMSG_SIZE, "Error: writing to FITS header failed."); return (-1); } @@@@ -932,7 +932,7 @@@@ int writeFITS(char *filename, char errms if (ferror (ofp->fp)) { - sprintf(errmsg, "Error: write error occured"); + snprintf(errmsg, ERRMSG_SIZE, "Error: write error occured"); return (-1); } @@@@ -951,7 +951,7 @@@@ int writeFITS(char *filename, char errms } -void uploadFile(char * filename) +void uploadFile(const char* filename) { FILE * fitsFile; char frameSize[FRAME_ILEN]; @@@@ -962,7 +962,7 @@@@ void uploadFile(char * filename) if ( -1 == stat (filename, &stat_p)) { - IDLog(" Error occoured attempting to stat %s\n", filename); + IDLog(" Error occoured attempting to stat file.\n"); return; } @@@@ -1185,7 +1185,7 @@@@ int manageDefaults(char errmsg[]) IDLog("Setting default exposure time of %d ms.\n", exposeTimeMS); if ( (err = FLISetExposureTime(fli_dev, exposeTimeMS) )) { - sprintf(errmsg, "FLISetExposureTime() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetExposureTime() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1193,7 +1193,7 @@@@ int manageDefaults(char errmsg[]) /* Default frame type is NORMAL */ if ( (err = FLISetFrameType(fli_dev, FLI_FRAME_TYPE_NORMAL) )) { - sprintf(errmsg, "FLISetFrameType() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetFrameType() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1201,7 +1201,7 @@@@ int manageDefaults(char errmsg[]) /* X horizontal binning */ if ( (err = FLISetHBin(fli_dev, BinningN[0].value) )) { - sprintf(errmsg, "FLISetBin() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetBin() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1209,7 +1209,7 @@@@ int manageDefaults(char errmsg[]) /* Y vertical binning */ if ( (err = FLISetVBin(fli_dev, BinningN[1].value) )) { - sprintf(errmsg, "FLISetVBin() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetVBin() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1293,7 +1293,7 @@@@ int checkPowerT(ITextVectorProperty *tp) void connectCCD() { long err; - char errmsg[1024]; + char errmsg[ERRMSG_SIZE]; IDLog ("In ConnectCCD\n"); @@@@ -1332,7 +1332,7 @@@@ void connectCCD() if (manageDefaults(errmsg)) { IDMessage(mydev, errmsg, NULL); - IDLog(errmsg); + IDLog("%s", errmsg); return; } @@@@ -1495,7 +1495,7 @@@@ FITS_HDU_LIST * create_fits_header (FITS fits_add_card (hdulist, temp_s); fits_add_card (hdulist, expose_s); fits_add_card (hdulist, pixel_s); - fits_add_card (hdulist, "INSTRUME= 'Finger Lakes Instruments'"); + fits_add_card (hdulist, ( char* ) "INSTRUME= 'Finger Lakes Instruments'"); fits_add_card (hdulist, obsDate); return (hdulist); @@@@ -1632,7 +1632,7 @@@@ int findPort() /* bind to given port for any IP address */ memset (&serv_socket, 0, sizeof(serv_socket)); serv_socket.sin_family = AF_INET; - serv_socket.sin_addr.s_addr = htonl (INADDR_ANY); + serv_socket.sin_addr.s_addr = htonl (INADDR_LOOPBACK); for (i=0; i < 100; i++) { @@@@ -1675,7 +1675,7 @@@@ void waitForData(int rp, int wp) /* bind to given port for any IP address */ memset (&serv_socket, 0, sizeof(serv_socket)); serv_socket.sin_family = AF_INET; - serv_socket.sin_addr.s_addr = htonl (INADDR_ANY); + serv_socket.sin_addr.s_addr = htonl (INADDR_LOOPBACK); serv_socket.sin_port = htons ((unsigned short)DataPort); if (setsockopt(sfd,SOL_SOCKET,SO_REUSEADDR,&reuse,sizeof(reuse)) < 0){ @ 1.1 log @Fix for http://www.kde.org/info/security/advisory-20050215-1.txt. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-aj was added on branch pkgsrc-2004Q4 on 2005-02-20 11:31:11 +0000 @ text @d1 254 @ 1.1.2.2 log @Pullup ticket 299 - requested by Mark Davies security fix for kdeedu3 Revisions pulled up: - pkgsrc/misc/kdeedu3/Makefile 1.29 - pkgsrc/misc/kdeedu3/distinfo 1.22 - pkgsrc/misc/kdeedu3/patches/patch-ac 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ad 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ae 1.1 - pkgsrc/misc/kdeedu3/patches/patch-af 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ag 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ah 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ai 1.1 - pkgsrc/misc/kdeedu3/patches/patch-aj 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ak 1.1 - pkgsrc/misc/kdeedu3/patches/patch-al 1.1 - pkgsrc/misc/kdeedu3/patches/patch-am 1.1 - pkgsrc/misc/kdeedu3/patches/patch-an 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ao 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ap 1.1 - pkgsrc/misc/kdeedu3/patches/patch-aq 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ar 1.1 - pkgsrc/misc/kdeedu3/patches/patch-as 1.1 - pkgsrc/misc/kdeedu3/patches/patch-at 1.1 - pkgsrc/misc/kdeedu3/patches/patch-au 1.1 - pkgsrc/misc/kdeedu3/patches/patch-av 1.1 - pkgsrc/misc/kdeedu3/patches/patch-aw 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ax 1.1 Module Name: pkgsrc Committed By: markd Date: Sun Feb 20 11:31:11 UTC 2005 Modified Files: pkgsrc/misc/kdeedu3: Makefile distinfo Added Files: pkgsrc/misc/kdeedu3/patches: patch-ac patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax Log Message: Fix for http://www.kde.org/info/security/advisory-20050215-1.txt. Bump PKGREVISION. @ text @a0 254 $NetBSD: patch-aj,v 1.1.2.1 2005/02/20 18:45:05 snj Exp $ --- kstars/kstars/indi/fli_ccd.c.orig 2004-10-03 20:13:39.000000000 +1300 +++ kstars/kstars/indi/fli_ccd.c @@@@ -51,9 +51,9 @@@@ void getBasicData(void); void initDataChannel(void); void waitForData(int rp, int wp); void updateDataChannel(void *p); -void uploadFile(char * filename); +void uploadFile(const char* filename); int findPort(void); -int writeFITS(char *filename, char errmsg[]); +int writeFITS(const char* filename, char errmsg[]); int findcam(flidomain_t domain); int setImageArea(char errmsg[]); int manageDefaults(char errmsg[]); @@@@ -419,7 +419,7 @@@@ void ISNewNumber (const char *dev, const long err; int i; INumber *np; - char errmsg[1024]; + char errmsg[ERRMSG_SIZE]; /* ignore if not ours */ if (dev && strcmp (dev, mydev)) @@@@ -556,14 +556,14 @@@@ void ISNewNumber (const char *dev, const if (nset < 4) { - IDSetNumber(&FrameNP, "Invalid range. Valid range is (0,0) - (%0.f,%0.f)", FLICam->width, FLICam->height); - IDLog("Invalid range. Valid range is (0,0) - (%0.f,%0.f)", FLICam->width, FLICam->height); + IDSetNumber(&FrameNP, "Invalid range. Valid range is (0,0) - (%0d,%0d)", FLICam->width, FLICam->height); + IDLog("Invalid range. Valid range is (0,0) - (%0d,%0d)", FLICam->width, FLICam->height); return; } if (setImageArea(errmsg)) { - IDSetNumber(&FrameNP, errmsg); + IDSetNumber(&FrameNP, "%s", errmsg); return; } @@@@ -600,8 +600,8 @@@@ void ISNewNumber (const char *dev, const { if (values[i] < 1 || values[i] > MAX_X_BIN) { - IDSetNumber(&BinningNP, "Error: Valid X bin values are from 1 to %d", MAX_X_BIN); - IDLog("Error: Valid X bin values are from 1 to %d", MAX_X_BIN); + IDSetNumber(&BinningNP, "Error: Valid X bin values are from 1 to %g", MAX_X_BIN); + IDLog("Error: Valid X bin values are from 1 to %g", MAX_X_BIN); return; } @@@@ -618,8 +618,8 @@@@ void ISNewNumber (const char *dev, const { if (values[i] < 1 || values[i] > MAX_Y_BIN) { - IDSetNumber(&BinningNP, "Error: Valid Y bin values are from 1 to %d", MAX_Y_BIN); - IDLog("Error: Valid X bin values are from 1 to %d", MAX_Y_BIN); + IDSetNumber(&BinningNP, "Error: Valid Y bin values are from 1 to %g", MAX_Y_BIN); + IDLog("Error: Valid X bin values are from 1 to %g", MAX_Y_BIN); return; } @@@@ -637,7 +637,7 @@@@ void ISNewNumber (const char *dev, const if (setImageArea(errmsg)) { IDSetNumber(&BinningNP, errmsg, NULL); - IDLog(errmsg); + IDLog("%s", errmsg); return; } @@@@ -817,8 +817,8 @@@@ int setImageArea(char errmsg[]) if ( (err = FLISetImageArea(fli_dev, x_1, y_1, x_2, y_2) )) { - sprintf(errmsg, "FLISetImageArea() failed. %s.\n", strerror((int)-err)); - IDLog(errmsg, NULL); + snprintf(errmsg, ERRMSG_SIZE, "FLISetImageArea() failed. %s.\n", strerror((int)-err)); + IDLog("%s", errmsg); return -1; } @@@@ -832,13 +832,13 @@@@ int grabImage() { long err; int img_size,i, fd; - char errmsg[1024]; + char errmsg[ERRMSG_SIZE]; char filename[] = "/tmp/fitsXXXXXX"; if ((fd = mkstemp(filename)) < 0) { - IDMessage(mydev, "Error making temporary filename.", NULL); - IDLog("Error making temporary filename.\n", NULL); + IDMessage(mydev, "Error making temporary filename."); + IDLog("Error making temporary filename.\n"); return -1; } close(fd); @@@@ -849,8 +849,8 @@@@ int grabImage() if (FLIImg->img == NULL) { - IDMessage(mydev, "Not enough memory to store image.", NULL); - IDLog("Not enough memory to store image.\n", NULL); + IDMessage(mydev, "Not enough memory to store image."); + IDLog("Not enough memory to store image.\n"); return -1; } @@@@ -880,7 +880,7 @@@@ int grabImage() } -int writeFITS(char *filename, char errmsg[]) +int writeFITS(const char* filename, char errmsg[]) { FITS_FILE* ofp; int i, j, bpp, bpsl, width, height; @@@@ -890,7 +890,7 @@@@ int writeFITS(char *filename, char errms ofp = fits_open (filename, "w"); if (!ofp) { - sprintf(errmsg, "Error: cannot open file for writing."); + snprintf(errmsg, ERRMSG_SIZE, "Error: cannot open file for writing."); return (-1); } @@@@ -903,12 +903,12 @@@@ int writeFITS(char *filename, char errms hdu = create_fits_header (ofp, width, height, bpp); if (hdu == NULL) { - sprintf(errmsg, "Error: creating FITS header failed."); + snprintf(errmsg, ERRMSG_SIZE, "Error: creating FITS header failed."); return (-1); } if (fits_write_header (ofp, hdu) < 0) { - sprintf(errmsg, "Error: writing to FITS header failed."); + snprintf(errmsg, ERRMSG_SIZE, "Error: writing to FITS header failed."); return (-1); } @@@@ -932,7 +932,7 @@@@ int writeFITS(char *filename, char errms if (ferror (ofp->fp)) { - sprintf(errmsg, "Error: write error occured"); + snprintf(errmsg, ERRMSG_SIZE, "Error: write error occured"); return (-1); } @@@@ -951,7 +951,7 @@@@ int writeFITS(char *filename, char errms } -void uploadFile(char * filename) +void uploadFile(const char* filename) { FILE * fitsFile; char frameSize[FRAME_ILEN]; @@@@ -962,7 +962,7 @@@@ void uploadFile(char * filename) if ( -1 == stat (filename, &stat_p)) { - IDLog(" Error occoured attempting to stat %s\n", filename); + IDLog(" Error occoured attempting to stat file.\n"); return; } @@@@ -1185,7 +1185,7 @@@@ int manageDefaults(char errmsg[]) IDLog("Setting default exposure time of %d ms.\n", exposeTimeMS); if ( (err = FLISetExposureTime(fli_dev, exposeTimeMS) )) { - sprintf(errmsg, "FLISetExposureTime() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetExposureTime() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1193,7 +1193,7 @@@@ int manageDefaults(char errmsg[]) /* Default frame type is NORMAL */ if ( (err = FLISetFrameType(fli_dev, FLI_FRAME_TYPE_NORMAL) )) { - sprintf(errmsg, "FLISetFrameType() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetFrameType() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1201,7 +1201,7 @@@@ int manageDefaults(char errmsg[]) /* X horizontal binning */ if ( (err = FLISetHBin(fli_dev, BinningN[0].value) )) { - sprintf(errmsg, "FLISetBin() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetBin() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1209,7 +1209,7 @@@@ int manageDefaults(char errmsg[]) /* Y vertical binning */ if ( (err = FLISetVBin(fli_dev, BinningN[1].value) )) { - sprintf(errmsg, "FLISetVBin() failed. %s.\n", strerror((int)-err)); + snprintf(errmsg, ERRMSG_SIZE, "FLISetVBin() failed. %s.\n", strerror((int)-err)); IDLog(errmsg, NULL); return -1; } @@@@ -1293,7 +1293,7 @@@@ int checkPowerT(ITextVectorProperty *tp) void connectCCD() { long err; - char errmsg[1024]; + char errmsg[ERRMSG_SIZE]; IDLog ("In ConnectCCD\n"); @@@@ -1332,7 +1332,7 @@@@ void connectCCD() if (manageDefaults(errmsg)) { IDMessage(mydev, errmsg, NULL); - IDLog(errmsg); + IDLog("%s", errmsg); return; } @@@@ -1495,7 +1495,7 @@@@ FITS_HDU_LIST * create_fits_header (FITS fits_add_card (hdulist, temp_s); fits_add_card (hdulist, expose_s); fits_add_card (hdulist, pixel_s); - fits_add_card (hdulist, "INSTRUME= 'Finger Lakes Instruments'"); + fits_add_card (hdulist, ( char* ) "INSTRUME= 'Finger Lakes Instruments'"); fits_add_card (hdulist, obsDate); return (hdulist); @@@@ -1632,7 +1632,7 @@@@ int findPort() /* bind to given port for any IP address */ memset (&serv_socket, 0, sizeof(serv_socket)); serv_socket.sin_family = AF_INET; - serv_socket.sin_addr.s_addr = htonl (INADDR_ANY); + serv_socket.sin_addr.s_addr = htonl (INADDR_LOOPBACK); for (i=0; i < 100; i++) { @@@@ -1675,7 +1675,7 @@@@ void waitForData(int rp, int wp) /* bind to given port for any IP address */ memset (&serv_socket, 0, sizeof(serv_socket)); serv_socket.sin_family = AF_INET; - serv_socket.sin_addr.s_addr = htonl (INADDR_ANY); + serv_socket.sin_addr.s_addr = htonl (INADDR_LOOPBACK); serv_socket.sin_port = htons ((unsigned short)DataPort); if (setsockopt(sfd,SOL_SOCKET,SO_REUSEADDR,&reuse,sizeof(reuse)) < 0){ @