From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- comms/gsmlib/files/patch-gsmlib::gsm_map_key.h | 48 ------------- comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h | 29 -------- .../gsmlib/files/patch-gsmlib::gsm_unix_serial.cc | 84 ---------------------- comms/gsmlib/files/patch-gsmlib__gsm_map_key.h | 48 +++++++++++++ comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h | 29 ++++++++ .../gsmlib/files/patch-gsmlib__gsm_unix_serial.cc | 84 ++++++++++++++++++++++ 6 files changed, 161 insertions(+), 161 deletions(-) delete mode 100644 comms/gsmlib/files/patch-gsmlib::gsm_map_key.h delete mode 100644 comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h delete mode 100644 comms/gsmlib/files/patch-gsmlib::gsm_unix_serial.cc create mode 100644 comms/gsmlib/files/patch-gsmlib__gsm_map_key.h create mode 100644 comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h create mode 100644 comms/gsmlib/files/patch-gsmlib__gsm_unix_serial.cc (limited to 'comms/gsmlib') diff --git a/comms/gsmlib/files/patch-gsmlib::gsm_map_key.h b/comms/gsmlib/files/patch-gsmlib::gsm_map_key.h deleted file mode 100644 index fe265b2691b2..000000000000 --- a/comms/gsmlib/files/patch-gsmlib::gsm_map_key.h +++ /dev/null @@ -1,48 +0,0 @@ ---- gsmlib/gsm_map_key.h.orig Tue May 14 23:38:12 2002 -+++ gsmlib/gsm_map_key.h Sun Sep 24 00:37:00 2006 -@@ -25,6 +25,16 @@ - - // wrapper for map key, can access Sortedtore to get sortOrder() - -+ template class MapKey; -+ -+ // compare two keys -+ template -+ extern bool operator<(const MapKey &x, -+ const MapKey &y); -+ template -+ extern bool operator==(const MapKey &x, -+ const MapKey &y); -+ - template class MapKey - { - SortedStore &_myStore; // my store -@@ -61,18 +71,10 @@ - const MapKey &y); - }; - -- // compare two keys -- template -- extern bool operator<(const MapKey &x, -- const MapKey &y); -- template -- extern bool operator==(const MapKey &x, -- const MapKey &y); -- - // MapKey members - - template -- bool gsmlib::operator<(const MapKey &x, -+ bool operator<(const MapKey &x, - const MapKey &y) - { - assert(&x._myStore == &y._myStore); -@@ -97,7 +99,7 @@ - } - - template -- bool gsmlib::operator==(const MapKey &x, -+ bool operator==(const MapKey &x, - const MapKey &y) - { - assert(&x._myStore == &y._myStore); diff --git a/comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h b/comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h deleted file mode 100644 index be5e42c2dbde..000000000000 --- a/comms/gsmlib/files/patch-gsmlib::gsm_me_ta.h +++ /dev/null @@ -1,29 +0,0 @@ ---- gsmlib/gsm_me_ta.h.orig Wed Dec 20 17:15:09 2006 -+++ gsmlib/gsm_me_ta.h Wed Dec 20 17:16:27 2006 -@@ -291,8 +291,8 @@ - // 3 disable phone receive RF circuits only - // 4 disable phone both transmit and receive RF circuits - // 5...127 implementation-defined -- int MeTa::getFunctionalityLevel() throw(GsmException); -- void MeTa::setFunctionalityLevel(int level) throw(GsmException); -+ int getFunctionalityLevel() throw(GsmException); -+ void setFunctionalityLevel(int level) throw(GsmException); - - // return battery charge status (+CBC): - // 0 ME is powered by the battery -@@ -386,13 +386,13 @@ - void setCallWaitingLockStatus(FacilityClass cl, - bool lock)throw(GsmException); - -- void MeTa::setCLIRPresentation(bool enable) throw(GsmException); -+ void setCLIRPresentation(bool enable) throw(GsmException); - //(+CLIR) - - // 0:according to the subscription of the CLIR service - // 1:CLIR invocation - // 2:CLIR suppression -- int MeTa::getCLIRPresentation() throw(GsmException); -+ int getCLIRPresentation() throw(GsmException); - - friend class Phonebook; - friend class SMSStore; diff --git a/comms/gsmlib/files/patch-gsmlib::gsm_unix_serial.cc b/comms/gsmlib/files/patch-gsmlib::gsm_unix_serial.cc deleted file mode 100644 index 4dabea9f4fcb..000000000000 --- a/comms/gsmlib/files/patch-gsmlib::gsm_unix_serial.cc +++ /dev/null @@ -1,84 +0,0 @@ ---- gsmlib/gsm_unix_serial.cc.orig Sun Sep 22 20:51:10 2002 -+++ gsmlib/gsm_unix_serial.cc Wed Aug 18 01:27:08 2004 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -178,11 +179,15 @@ - - // switch off non-blocking mode - int fdFlags; -- if ((fdFlags = fcntl(_fd, F_GETFL)) == -1) -+ if ((fdFlags = fcntl(_fd, F_GETFL)) == -1) { -+ close(_fd); - throwModemException(_("getting file status flags failed")); -+ } - fdFlags &= ~O_NONBLOCK; -- if (fcntl(_fd, F_SETFL, fdFlags) == -1) -+ if (fcntl(_fd, F_SETFL, fdFlags) == -1) { -+ close(_fd); - throwModemException(_("switching of non-blocking mode failed")); -+ } - - long int saveTimeoutVal = _timeoutVal; - _timeoutVal = 3; -@@ -194,17 +199,22 @@ - - // toggle DTR to reset modem - int mctl = TIOCM_DTR; -- if (ioctl(_fd, TIOCMBIC, &mctl) < 0) -+ if (ioctl(_fd, TIOCMBIC, &mctl) < 0) { -+ close(_fd); - throwModemException(_("clearing DTR failed")); -+ } - // the waiting time for DTR toggling is increased with each loop - usleep(holdoff[initTries]); -- if (ioctl(_fd, TIOCMBIS, &mctl) < 0) -+ if (ioctl(_fd, TIOCMBIS, &mctl) < 0) { -+ close(_fd); - throwModemException(_("setting DTR failed")); -- -+ } - // get line modes -- if (tcgetattr(_fd, &t) < 0) -+ if (tcgetattr(_fd, &t) < 0) { -+ close(_fd); - throwModemException(stringPrintf(_("tcgetattr device '%s'"), - device.c_str())); -+ } - - // set line speed - cfsetispeed(&t, lineSpeed); -@@ -229,9 +239,11 @@ - t.c_cc[VSUSP] = 0; - - // write back -- if(tcsetattr (_fd, TCSANOW, &t) < 0) -+ if(tcsetattr (_fd, TCSANOW, &t) < 0) { -+ close(_fd); - throwModemException(stringPrintf(_("tcsetattr device '%s'"), - device.c_str())); -+ } - // the waiting time for writing to the ME/TA is increased with each loop - usleep(holdoff[initTries]); - -@@ -279,11 +291,14 @@ - catch (GsmException &e) - { - _timeoutVal = saveTimeoutVal; -- if (initTries == 0) -+ if (initTries == 0) { -+ close(_fd); - throw e; -+ } - } - } - // no response after 3 tries -+ close(_fd); - throw GsmException(stringPrintf(_("reset modem failed '%s'"), - device.c_str()), OtherError); - } diff --git a/comms/gsmlib/files/patch-gsmlib__gsm_map_key.h b/comms/gsmlib/files/patch-gsmlib__gsm_map_key.h new file mode 100644 index 000000000000..fe265b2691b2 --- /dev/null +++ b/comms/gsmlib/files/patch-gsmlib__gsm_map_key.h @@ -0,0 +1,48 @@ +--- gsmlib/gsm_map_key.h.orig Tue May 14 23:38:12 2002 ++++ gsmlib/gsm_map_key.h Sun Sep 24 00:37:00 2006 +@@ -25,6 +25,16 @@ + + // wrapper for map key, can access Sortedtore to get sortOrder() + ++ template class MapKey; ++ ++ // compare two keys ++ template ++ extern bool operator<(const MapKey &x, ++ const MapKey &y); ++ template ++ extern bool operator==(const MapKey &x, ++ const MapKey &y); ++ + template class MapKey + { + SortedStore &_myStore; // my store +@@ -61,18 +71,10 @@ + const MapKey &y); + }; + +- // compare two keys +- template +- extern bool operator<(const MapKey &x, +- const MapKey &y); +- template +- extern bool operator==(const MapKey &x, +- const MapKey &y); +- + // MapKey members + + template +- bool gsmlib::operator<(const MapKey &x, ++ bool operator<(const MapKey &x, + const MapKey &y) + { + assert(&x._myStore == &y._myStore); +@@ -97,7 +99,7 @@ + } + + template +- bool gsmlib::operator==(const MapKey &x, ++ bool operator==(const MapKey &x, + const MapKey &y) + { + assert(&x._myStore == &y._myStore); diff --git a/comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h b/comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h new file mode 100644 index 000000000000..be5e42c2dbde --- /dev/null +++ b/comms/gsmlib/files/patch-gsmlib__gsm_me_ta.h @@ -0,0 +1,29 @@ +--- gsmlib/gsm_me_ta.h.orig Wed Dec 20 17:15:09 2006 ++++ gsmlib/gsm_me_ta.h Wed Dec 20 17:16:27 2006 +@@ -291,8 +291,8 @@ + // 3 disable phone receive RF circuits only + // 4 disable phone both transmit and receive RF circuits + // 5...127 implementation-defined +- int MeTa::getFunctionalityLevel() throw(GsmException); +- void MeTa::setFunctionalityLevel(int level) throw(GsmException); ++ int getFunctionalityLevel() throw(GsmException); ++ void setFunctionalityLevel(int level) throw(GsmException); + + // return battery charge status (+CBC): + // 0 ME is powered by the battery +@@ -386,13 +386,13 @@ + void setCallWaitingLockStatus(FacilityClass cl, + bool lock)throw(GsmException); + +- void MeTa::setCLIRPresentation(bool enable) throw(GsmException); ++ void setCLIRPresentation(bool enable) throw(GsmException); + //(+CLIR) + + // 0:according to the subscription of the CLIR service + // 1:CLIR invocation + // 2:CLIR suppression +- int MeTa::getCLIRPresentation() throw(GsmException); ++ int getCLIRPresentation() throw(GsmException); + + friend class Phonebook; + friend class SMSStore; diff --git a/comms/gsmlib/files/patch-gsmlib__gsm_unix_serial.cc b/comms/gsmlib/files/patch-gsmlib__gsm_unix_serial.cc new file mode 100644 index 000000000000..4dabea9f4fcb --- /dev/null +++ b/comms/gsmlib/files/patch-gsmlib__gsm_unix_serial.cc @@ -0,0 +1,84 @@ +--- gsmlib/gsm_unix_serial.cc.orig Sun Sep 22 20:51:10 2002 ++++ gsmlib/gsm_unix_serial.cc Wed Aug 18 01:27:08 2004 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -178,11 +179,15 @@ + + // switch off non-blocking mode + int fdFlags; +- if ((fdFlags = fcntl(_fd, F_GETFL)) == -1) ++ if ((fdFlags = fcntl(_fd, F_GETFL)) == -1) { ++ close(_fd); + throwModemException(_("getting file status flags failed")); ++ } + fdFlags &= ~O_NONBLOCK; +- if (fcntl(_fd, F_SETFL, fdFlags) == -1) ++ if (fcntl(_fd, F_SETFL, fdFlags) == -1) { ++ close(_fd); + throwModemException(_("switching of non-blocking mode failed")); ++ } + + long int saveTimeoutVal = _timeoutVal; + _timeoutVal = 3; +@@ -194,17 +199,22 @@ + + // toggle DTR to reset modem + int mctl = TIOCM_DTR; +- if (ioctl(_fd, TIOCMBIC, &mctl) < 0) ++ if (ioctl(_fd, TIOCMBIC, &mctl) < 0) { ++ close(_fd); + throwModemException(_("clearing DTR failed")); ++ } + // the waiting time for DTR toggling is increased with each loop + usleep(holdoff[initTries]); +- if (ioctl(_fd, TIOCMBIS, &mctl) < 0) ++ if (ioctl(_fd, TIOCMBIS, &mctl) < 0) { ++ close(_fd); + throwModemException(_("setting DTR failed")); +- ++ } + // get line modes +- if (tcgetattr(_fd, &t) < 0) ++ if (tcgetattr(_fd, &t) < 0) { ++ close(_fd); + throwModemException(stringPrintf(_("tcgetattr device '%s'"), + device.c_str())); ++ } + + // set line speed + cfsetispeed(&t, lineSpeed); +@@ -229,9 +239,11 @@ + t.c_cc[VSUSP] = 0; + + // write back +- if(tcsetattr (_fd, TCSANOW, &t) < 0) ++ if(tcsetattr (_fd, TCSANOW, &t) < 0) { ++ close(_fd); + throwModemException(stringPrintf(_("tcsetattr device '%s'"), + device.c_str())); ++ } + // the waiting time for writing to the ME/TA is increased with each loop + usleep(holdoff[initTries]); + +@@ -279,11 +291,14 @@ + catch (GsmException &e) + { + _timeoutVal = saveTimeoutVal; +- if (initTries == 0) ++ if (initTries == 0) { ++ close(_fd); + throw e; ++ } + } + } + // no response after 3 tries ++ close(_fd); + throw GsmException(stringPrintf(_("reset modem failed '%s'"), + device.c_str()), OtherError); + } -- cgit v1.2.3