Quellcode durchsuchen

Avoid some variable aliasing

tags/v1.11.90
Pierre Ossman vor 3 Jahren
Ursprung
Commit
a29fe72102
3 geänderte Dateien mit 9 neuen und 9 gelöschten Zeilen
  1. 1
    1
      common/rfb/CSecurity.h
  2. 1
    1
      common/rfb/SSecurity.h
  3. 7
    7
      unix/xserver/hw/vnc/XserverDesktop.cc

+ 1
- 1
common/rfb/CSecurity.h Datei anzeigen

class CConnection; class CConnection;
class CSecurity { class CSecurity {
public: public:
CSecurity(CConnection* cc) { this->cc = cc; }
CSecurity(CConnection* cc_) : cc(cc_) {}
virtual ~CSecurity() {} virtual ~CSecurity() {}
virtual bool processMsg() = 0; virtual bool processMsg() = 0;
virtual int getType() const = 0; virtual int getType() const = 0;

+ 1
- 1
common/rfb/SSecurity.h Datei anzeigen



class SSecurity { class SSecurity {
public: public:
SSecurity(SConnection* sc) { this->sc = sc; }
SSecurity(SConnection* sc_) : sc(sc_) {}
virtual ~SSecurity() {} virtual ~SSecurity() {}
virtual bool processMsg() = 0; virtual bool processMsg() = 0;
virtual int getType() const = 0; virtual int getType() const = 0;

+ 7
- 7
unix/xserver/hw/vnc/XserverDesktop.cc Datei anzeigen

std::list<network::SocketListener*> listeners_, std::list<network::SocketListener*> listeners_,
const char* name, const rfb::PixelFormat &pf, const char* name, const rfb::PixelFormat &pf,
int width, int height, int width, int height,
void* fbptr, int stride)
void* fbptr, int stride_)
: screenIndex(screenIndex_), : screenIndex(screenIndex_),
server(0), listeners(listeners_), server(0), listeners(listeners_),
shadowFramebuffer(NULL), shadowFramebuffer(NULL),
format = pf; format = pf;


server = new VNCServerST(name, this); server = new VNCServerST(name, this);
setFramebuffer(width, height, fbptr, stride);
setFramebuffer(width, height, fbptr, stride_);


for (std::list<SocketListener*>::iterator i = listeners.begin(); for (std::list<SocketListener*>::iterator i = listeners.begin();
i != listeners.end(); i != listeners.end();
} }
} }


void XserverDesktop::sendClipboardData(const char* data)
void XserverDesktop::sendClipboardData(const char* data_)
{ {
try { try {
server->sendClipboardData(data);
server->sendClipboardData(data_);
} catch (rdr::Exception& e) { } catch (rdr::Exception& e) {
vlog.error("XserverDesktop::sendClipboardData: %s",e.str()); vlog.error("XserverDesktop::sendClipboardData: %s",e.str());
} }
region.get_rects(&rects); region.get_rects(&rects);
for (i = rects.begin(); i != rects.end(); i++) { for (i = rects.begin(); i != rects.end(); i++) {
rdr::U8 *buffer; rdr::U8 *buffer;
int stride;
int bufStride;


buffer = getBufferRW(*i, &stride);
buffer = getBufferRW(*i, &bufStride);
vncGetScreenImage(screenIndex, i->tl.x, i->tl.y, i->width(), i->height(), vncGetScreenImage(screenIndex, i->tl.x, i->tl.y, i->width(), i->height(),
(char*)buffer, stride * format.bpp/8);
(char*)buffer, bufStride * format.bpp/8);
commitBufferRW(*i); commitBufferRW(*i);
} }
} }

Laden…
Abbrechen
Speichern